diff options
| author | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-27 23:30:28 +0000 |
|---|---|---|
| committer | coryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-01-27 23:30:28 +0000 |
| commit | 13f64ccd419f840d3b3186cb98040f4242b93517 (patch) | |
| tree | 4b5e2a68d3b291e3ae447bc3f2ba755d3f0accec | |
| parent | 8ab2829353b99f39cebac9e17fb1b370ee2dcaab (diff) | |
| download | ATCD-13f64ccd419f840d3b3186cb98040f4242b93517.tar.gz | |
ChangeLogTag:Tue Jan 27 17:29:11 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLog-98c | 5 | ||||
| -rw-r--r-- | TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile | 6 | ||||
| -rw-r--r-- | TAO/tests/Cubit/TAO/MT_Cubit/Makefile | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c index df2637d5ef9..eddc77f07d4 100644 --- a/TAO/ChangeLog-98c +++ b/TAO/ChangeLog-98c @@ -1,3 +1,8 @@ +Tue Jan 27 17:29:11 1998 Carlos O'Ryan <coryan@cs.wustl.edu> + + * tests/Cubit/TAO/IDL_Cubit/Makefile: + Reorder includes to avoid evil definition for the IDL compiler. + Tue Jan 27 16:16:11 1998 Chris Cleeland <cleeland@cs.wustl.edu> * tests/Param_Test/server.cpp: Added ACE_UNUSED_ARG() inside the diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile index 858127d1b69..16ed7554533 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO +LDLIBS = -lTAO -lm IDL_SRC = cubitC.cpp cubitS.cpp PROG_SRCS = server.cpp \ @@ -35,11 +35,11 @@ VBIN = $(BIN:%=%$(VAR)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -include $(TAO_ROOT)/rules.tao.GNU # Local modifications to variables imported by includes above. #CPPFLAGS += -DACE_NLOGGING @@ -47,7 +47,7 @@ include $(TAO_ROOT)/rules.tao.GNU #CXX := purify $(CXX) ##DCFLAGS = -g OCFLAGS = -LDFLAGS += -L$(TAO_ROOT)/tao -lposix4 +LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat .PRECIOUS: $(IDL_SRC) diff --git a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile b/TAO/tests/Cubit/TAO/MT_Cubit/Makefile index 858127d1b69..16ed7554533 100644 --- a/TAO/tests/Cubit/TAO/MT_Cubit/Makefile +++ b/TAO/tests/Cubit/TAO/MT_Cubit/Makefile @@ -9,7 +9,7 @@ # Local macros #---------------------------------------------------------------------------- -LDLIBS = -lTAO +LDLIBS = -lTAO -lm IDL_SRC = cubitC.cpp cubitS.cpp PROG_SRCS = server.cpp \ @@ -35,11 +35,11 @@ VBIN = $(BIN:%=%$(VAR)) include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU include $(ACE_ROOT)/include/makeinclude/macros.GNU +include $(TAO_ROOT)/rules.tao.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU -include $(TAO_ROOT)/rules.tao.GNU # Local modifications to variables imported by includes above. #CPPFLAGS += -DACE_NLOGGING @@ -47,7 +47,7 @@ include $(TAO_ROOT)/rules.tao.GNU #CXX := purify $(CXX) ##DCFLAGS = -g OCFLAGS = -LDFLAGS += -L$(TAO_ROOT)/tao -lposix4 +LDFLAGS += -L$(TAO_ROOT)/tao CPPFLAGS += -I$(TAO_ROOT) -I$(TAO_ROOT)/tao/compat .PRECIOUS: $(IDL_SRC) |