diff options
| author | Steve Huston <shuston@riverace.com> | 1999-03-16 01:28:03 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 1999-03-16 01:28:03 +0000 |
| commit | 1012335d6ce92a73c728c8a139b61db241a393bd (patch) | |
| tree | ee3d7181ba9e33f46ca5f1485b1443f114443277 /tests | |
| parent | 6a3e86da7f8be8986575ba63010c13697d6ca1e8 (diff) | |
| download | ATCD-1012335d6ce92a73c728c8a139b61db241a393bd.tar.gz | |
Fixed to build libDLL_Test correctly on AIX w/ xlC.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 5 | ||||
| -rw-r--r-- | tests/Makefile.DLL | 14 |
2 files changed, 16 insertions, 3 deletions
diff --git a/tests/Makefile b/tests/Makefile index 67fcc34835a..fd20db54e59 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -106,10 +106,13 @@ endif #---------------------------------------------------------------------------- libDLL_Test.$(SOEXT): DLL_Test.cpp +ifdef TEMPINCDIR + $(RM) .obj/DLL_Test.o +endif @$(MAKE) -f Makefile.DLL realclean: clean - -/bin/rm -rf libDLL_Test.$(SOEXT) + -$(RM) libDLL_Test.$(SOEXT) #---------------------------------------------------------------------------- # Dependencies diff --git a/tests/Makefile.DLL b/tests/Makefile.DLL index a090724413b..2ed3909f987 100644 --- a/tests/Makefile.DLL +++ b/tests/Makefile.DLL @@ -8,10 +8,14 @@ # Local macros #---------------------------------------------------------------------------- +LIB = libDLL_Test.a SHLIB = libDLL_Test.$(SOEXT) FILES = DLL_Test LSRC = $(addsuffix .cpp,$(FILES)) -VLDLIBS = $(LDLIBS:%=%$(VAR)) + +LIBS += $(ACELIB) + +BUILD = $(VLIB) $(VSHLIB) #---------------------------------------------------------------------------- # Include macros and targets @@ -22,9 +26,15 @@ include $(ACE_ROOT)/include/makeinclude/macros.GNU include $(ACE_ROOT)/include/makeinclude/rules.common.GNU include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU include $(ACE_ROOT)/include/makeinclude/rules.lib.GNU -include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +# To remake the DLL_Test source with xlC on AIX, it works +# best to wipe out any previously-created tempinc directory. +# The compiler/linker isn't too smart about instantiating templates... +ifdef TEMPINCDIR +COMPILE.cc := $(RM) -rf tempinc; $(COMPILE.cc) +endif + #---------------------------------------------------------------------------- # Local targets #---------------------------------------------------------------------------- |