From: Yurii R. <yr...@us...> - 2003-02-08 08:24:20
|
Update of /cvsroot/eas-dev/eas-dev/build/unix/mk In directory sc8-pr-cvs1:/tmp/cvs-serv23957/build/unix/mk Modified Files: component.mk.in Log Message: Improved openeas.rdb building (w/ site common.rdb); some minor additions to `logger' components; misc changes at the rest Index: component.mk.in =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/build/unix/mk/component.mk.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- component.mk.in 4 Feb 2003 07:52:25 -0000 1.8 +++ component.mk.in 8 Feb 2003 08:23:46 -0000 1.9 @@ -31,18 +31,28 @@ SRC_PATH = src endif +ifndef TEST_PATH + TEST_PATH = tests +endif + +ifndef RUN_TESTS + RUN_TESTS = runTests +endif + + ifndef BIN_PATH BIN_PATH = bin endif ifndef INC_PATH - INC_PATH = ../.include + INC_PATH = ../.incs endif -ifndef SRC_PATH - SRC_PATH = src +ifndef COMMON_RDB + COMMON_RDB = $(top_srcdir)/../../tools/uno/common.rdb endif + SRCS = $(SRC_FILES) IDLS = $(IDL_FILES) @@ -60,13 +70,16 @@ TYPES = $(foreach t,$(shell $(XML2CMP) -types stdout $(DESCRIPTOR)),-T$(t)) -all: $(SRC_PATH)/.libs/lib$(COMPONENT).so +all: $(SRC_PATH)/.libs/lib$(COMPONENT).so $(TEST_PATH)/$(RUN_TESTS) + +$(TEST_PATH)/$(RUN_TESTS): $(SRC_PATH)/.libs/lib$(COMPONENT).so + $(MAKE) -C $(TEST_PATH) $(SRC_PATH)/.libs/lib$(COMPONENT).so: $(AUTOCODE) $(MAKE) -C $(SRC_PATH) -$(AUTOCODE) : $(BIN_PATH)/$(COMPONENT).rdb ../.openeas.rdb - $(CODEMAKER)maker -BUCR -O$(INC_PATH) $(TYPES) $(BIN_PATH)/$(COMPONENT).rdb ../.openeas.rdb +$(AUTOCODE) : $(BIN_PATH)/$(COMPONENT).rdb $(COMMON_RDB) + $(CODEMAKER)maker -BUCR -O$(INC_PATH) $(TYPES) $(BIN_PATH)/$(COMPONENT).rdb $(COMMON_RDB) $(BIN_PATH)/$(COMPONENT).rdb: $(URDS_) $(REGMERGE) $(BIN_PATH)/$(COMPONENT).rdb /UCR $(URDS_) |