summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-19 16:15:35 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-08-19 16:15:35 +0000
commit9a8b1e4aff20dcd0c53bc7d7fb357121f13304a1 (patch)
tree4e8911464e984bff92e85ccf22019daef9e62dfc
parentdf86755c8cce45a28d067ebab0cd6bc6595d6aec (diff)
downloadATCD-9a8b1e4aff20dcd0c53bc7d7fb357121f13304a1.tar.gz
replaced explicit build rule for Sched_Conf with include of rules.bin.GNU.
-rw-r--r--TAO/orbsvcs/tests/Sched_Conf/Makefile24
1 files changed, 10 insertions, 14 deletions
diff --git a/TAO/orbsvcs/tests/Sched_Conf/Makefile b/TAO/orbsvcs/tests/Sched_Conf/Makefile
index a772916ad2f..64cba467cb9 100644
--- a/TAO/orbsvcs/tests/Sched_Conf/Makefile
+++ b/TAO/orbsvcs/tests/Sched_Conf/Makefile
@@ -4,9 +4,9 @@ BIN = Sched_Conf
BUILD = $(BIN)
DUMP_SRCS = \
- Sched_Conf.cpp
+ Sched_Conf.cpp
-LSRC = $(DUMP_SRCS)
+LSRC = $(DUMP_SRCS)
SCHEDULE_OBJS=$(SCHEDULE_SRCS:.cpp=.o)
DUMP_OBJS=$(DUMP_SRCS:.cpp=.o)
@@ -15,15 +15,15 @@ LDLIBS = -lorbsvcs -lTAO
VLDLIBS = $(LDLIBS:%=%$(VAR))
#----------------------------------------------------------------------------
-# Include macros and targets
+# Include macros and targets
#----------------------------------------------------------------------------
-include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
-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.bin.GNU
-include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
+include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU
+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.bin.GNU
+include $(ACE_ROOT)/include/makeinclude/rules.local.GNU
ifndef TAO_ROOT
TAO_ROOT = $(ACE_ROOT)/TAO
@@ -32,12 +32,8 @@ TSS_ORB_FLAG = #-DTAO_HAS_TSS_ORBCORE
LDFLAGS += -L$(TAO_ROOT)/orbsvcs/orbsvcs -L$(TAO_ROOT)/tao
CPPFLAGS += -I$(TAO_ROOT)/orbsvcs -I$(TAO_ROOT) $(TSS_ORB_FLAG)
-Sched_Conf: $(addprefix $(VDIR),$(DUMP_OBJS))
- $(LINK.cc) $(LDFLAGS) -o $@ $^ $(VLDLIBS) $(POSTLINK)
-
-
#----------------------------------------------------------------------------
-# Dependencies
+# Dependencies
#----------------------------------------------------------------------------
# DO NOT DELETE THIS LINE -- g++dep uses it.