From: Yurii R. <yr...@us...> - 2003-01-25 02:51:54
|
Update of /cvsroot/eas-dev/eas-dev/components In directory sc8-pr-cvs1:/tmp/cvs-serv1137/components Modified Files: Makefile.am Log Message: Misc. changes in build process, document authoring process Index: Makefile.am =================================================================== RCS file: /cvsroot/eas-dev/eas-dev/components/Makefile.am,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Makefile.am 23 Jan 2003 00:50:27 -0000 1.2 +++ Makefile.am 25 Jan 2003 02:51:50 -0000 1.3 @@ -1,4 +1,4 @@ -COMPONENTS = gmp logger +COMPONENTS = logger ODK = @ODK_PATH@ IDLC = @IDLC@ REGMERGE = @REGMERGE@ @@ -84,13 +84,19 @@ BASIC_URDS = $(subst idl,urd,$(BASIC_IDLS)) BASIC_URDS_ = $(patsubst %.urd,$(BIN_PATH)/%.urd,$(BASIC_URDS)) +COMPILED_COMPONENTS=$(patsubst %,%/bin/lib%.so,$(COMPONENTS)) +COMPONENTS_REGISTRY=$(patsubst %,%/bin/%.rdb,$(COMPONENTS)) all-local: openeas.rdb -openeas.rdb: openeas-basic.rdb +openeas.rdb: $(COMPILED_COMPONENTS) $(COMPONENTS_REGISTRY) + $(REGMERGE) openeas.rdb /UCR openeas-basic.rdb $(COMPONENTS_REGISTRY) + +$(COMPILED_COMPONENTS): openeas-basic.rdb for dir in $(COMPONENTS); do \ $(MAKE) -C $$dir; \ done + openeas-basic.rdb: $(BASIC_URDS_) $(REGMERGE) openeas-basic.rdb /UCR $(BASIC_URDS_) |