diff options
author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-02-20 21:54:23 +0000 |
---|---|---|
committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-02-20 21:54:23 +0000 |
commit | 3d55d27da56a5d547f83c14c756d09a53d7a79d6 (patch) | |
tree | 8531ee8bf727752a295f5f39c6193788414c2d52 | |
parent | 7867c896b9a8bf4eea4204b079aa45f47f48f4a0 (diff) | |
download | ATCD-3d55d27da56a5d547f83c14c756d09a53d7a79d6.tar.gz |
moved TAO_IDLFLAGS override to after includes, so that any settings in platform_macros.GNU are not lost
-rw-r--r-- | TAO/tests/Param_Test/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/TAO/tests/Param_Test/Makefile b/TAO/tests/Param_Test/Makefile index ad186822643..63fc5ce79d2 100644 --- a/TAO/tests/Param_Test/Makefile +++ b/TAO/tests/Param_Test/Makefile @@ -12,10 +12,6 @@ ifndef TAO_ROOT TAO_ROOT = $(ACE_ROOT)/TAO endif # ! TAO_ROOT -override TAO_IDLFLAGS += -hc Cli.h -hs Ser.h -hT Ser_T.h \ - -cs Cli.cpp -ci Cli.i \ - -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i - LDLIBS = -lTAO LDFLAGS += -L$(TAO_ROOT)/tao @@ -93,6 +89,10 @@ include $(ACE_ROOT)/include/makeinclude/rules.nonested.GNU #include $(ACE_ROOT)/include/makeinclude/rules.bin.GNU include $(ACE_ROOT)/include/makeinclude/rules.local.GNU +override TAO_IDLFLAGS += -hc Cli.h -hs Ser.h -hT Ser_T.h \ + -cs Cli.cpp -ci Cli.i \ + -ss Ser.cpp -sT Ser_T.cpp -si Ser.i -st Ser_T.i + TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE CPPFLAGS += -I$(TAO_ROOT) $(TSS_ORB_FLAG) |