diff options
| -rw-r--r-- | ChangeLog-97b | 14 | ||||
| -rw-r--r-- | examples/ASX/CCM_App/Makefile | 5 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/Makefile | 4 | ||||
| -rw-r--r-- | include/makeinclude/rules.bin.GNU | 4 |
4 files changed, 16 insertions, 11 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b index 128fd636840..e040eefb6e5 100644 --- a/ChangeLog-97b +++ b/ChangeLog-97b @@ -1,6 +1,16 @@ +Fri Oct 10 19:55:50 1997 Carlos O'Ryan <coryan@macarena.cs.wustl.edu> + + * examples/ASX/CCM_App/Makefile: + * include/makeinclude/rules.bin.GNU: + I have applied Steve Huston changes from Oct 01, the change was + (IMHO) useful and made compilation cleaner. + + * examples/ASX/Event_Server/Event_Server/Makefile: + Fixed problem that made compilation fail. + Fri Oct 10 19:52:44 1997 <nw1@CHA-CHA> - * ace/OS.H: + * ace/OS.h: * ace/Connector.cpp: * ace/SOCK_Connector.cpp: Added constant ACE_OS::NON_BLOCKING_BUG_DELAY and replace their uses from some @@ -20,7 +30,7 @@ Fri Oct 10 15:21:07 1997 <irfan@TWOSTEP> * examples/Connection/non_blocking/CPP-connector.cpp (disconnecting): Remove this method. It was not being used. Also - rewrote some parts of handle_close to make the code simple. + rewrote some parts of handle_close to make the code simple. * ace/Connector.cpp (create_AST): The register_handler() method now needs to explicitly be given the handle to wait on. This is diff --git a/examples/ASX/CCM_App/Makefile b/examples/ASX/CCM_App/Makefile index e060ee7efb4..d587b4b7220 100644 --- a/examples/ASX/CCM_App/Makefile +++ b/examples/ASX/CCM_App/Makefile @@ -1,5 +1,6 @@ #---------------------------------------------------------------------------- -# @(#)Makefile 1.1 10/18/96 +# +# $Id$ # # Makefile for CCM tests #---------------------------------------------------------------------------- @@ -14,8 +15,6 @@ BIN = SC_Client \ LSRC = $(addsuffix .cpp,$(BIN)) \ CCM_App.cpp -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BUILD = $(VSHLIB) $(SHLIBA) $(VBIN) #---------------------------------------------------------------------------- diff --git a/examples/ASX/Event_Server/Event_Server/Makefile b/examples/ASX/Event_Server/Event_Server/Makefile index de78a15e3c6..aa48bfa59ae 100644 --- a/examples/ASX/Event_Server/Event_Server/Makefile +++ b/examples/ASX/Event_Server/Event_Server/Makefile @@ -20,10 +20,6 @@ LSRC = $(addsuffix .cpp,$(FILES)) LOBJ = $(addsuffix .o,$(FILES)) SHOBJ = $(addsuffix .so,$(FILES)) -LDLIBS = $(addprefix $(VSHDIR),$(SHOBJ)) - -VLDLIBS = $(LDLIBS:%=%$(VAR)) - BUILD = $(VBIN) #---------------------------------------------------------------------------- diff --git a/include/makeinclude/rules.bin.GNU b/include/makeinclude/rules.bin.GNU index 764973c730a..1b30f417237 100644 --- a/include/makeinclude/rules.bin.GNU +++ b/include/makeinclude/rules.bin.GNU @@ -8,5 +8,5 @@ VBIN = $(BIN:%=%$(VAR)) -$(BIN): %: $(VDIR)%.o $(VSHOBJS) - $(LINK.cc) -o $@ $< $(LDFLAGS) $(VLDLIBS) $(POSTLINK) +$(BIN): %: $(VDIR)%.o $(VOBJS) + $(LINK.cc) -o $@ $^ $(LDFLAGS) $(VLDLIBS) $(POSTLINK) |