From c34635be66a922aad67af49a7b5f5ba54add6fb4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Fri, 8 Nov 2002 17:57:06 +0000 Subject: 2002-11-08 Ralf Corsepius * rtems/Makefile.am: Reworked. * sapi/Makefile.am: Reworked. * rel.am: New. --- c/src/optman/ChangeLog | 6 ++++++ c/src/optman/rel.am | 19 +++++++++++++++++++ c/src/optman/rtems/Makefile.am | 21 ++------------------- c/src/optman/sapi/Makefile.am | 22 +++------------------- 4 files changed, 30 insertions(+), 38 deletions(-) create mode 100644 c/src/optman/rel.am (limited to 'c/src/optman') diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog index ebd170c807..e1223b0cd0 100644 --- a/c/src/optman/ChangeLog +++ b/c/src/optman/ChangeLog @@ -1,3 +1,9 @@ +2002-11-08 Ralf Corsepius + + * rtems/Makefile.am: Reworked. + * sapi/Makefile.am: Reworked. + * rel.am: New. + 2002-10-21 Ralf Corsepius * .cvsignore: Reformat. diff --git a/c/src/optman/rel.am b/c/src/optman/rel.am new file mode 100644 index 0000000000..fd47220c33 --- /dev/null +++ b/c/src/optman/rel.am @@ -0,0 +1,19 @@ +# Make foo.rel from foo.o +${ARCH}/%$(LIB_VARIANT).rel: ${ARCH}/%.o + test -d $(ARCH) || mkdir $(ARCH) + ${make-rel} + +bsplib_DATA = $(PGMS) + +TMPINSTALL_FILES += \ + $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel) + +$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%$(LIB_VARIANT).rel + $(INSTALL_DATA) $< $@ + +all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES) + +.PRECIOUS: $(PGMS) + +EXTRA_DIST = $(C_FILES) + diff --git a/c/src/optman/rtems/Makefile.am b/c/src/optman/rtems/Makefile.am index e594949876..dd0e847a5a 100644 --- a/c/src/optman/rtems/Makefile.am +++ b/c/src/optman/rtems/Makefile.am @@ -7,28 +7,11 @@ C_FILES = no-dpmem.c no-event.c no-msg.c no-mp.c no-part.c no-region.c \ no-rtmon.c no-sem.c no-signal.c no-timer.c C_O_FILES = $(C_FILES:%.c=${ARCH}/%.$(OBJEXT)) -PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) +PGMS = $(C_FILES:%.c=$(ARCH)/%$(LIB_VARIANT).rel) include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am - -bsplib_DATA = $(PGMS) - -TMPINSTALL_FILES += \ - $(C_FILES:%.c=$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel) - -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel: $(ARCH)/%.rel - $(INSTALL_DATA) $< $@ - -# -# (OPTIONAL) Add local stuff here using += -# - -all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGMS) - -EXTRA_DIST = $(C_FILES) +include ../rel.am include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/optman/sapi/Makefile.am b/c/src/optman/sapi/Makefile.am index 1a1ca0e893..87d357e6ab 100644 --- a/c/src/optman/sapi/Makefile.am +++ b/c/src/optman/sapi/Makefile.am @@ -6,27 +6,11 @@ C_FILES = no-ext.c no-io.c C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT)) -PGMS = $(C_FILES:%.c=$(ARCH)/%.rel) +PGMS = $(C_FILES:%.c=$(ARCH)/%$(LIB_VARIANT).rel) +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am - -bsplib_DATA = $(PGMS) - -TMPINSTALL_FILES += \ - $(C_FILES:%.c=$(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel) - -$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/%$(LIB_VARIANT).rel: $(ARCH)/%.rel - $(INSTALL_DATA) $< $@ - -# -# (OPTIONAL) Add local stuff here using += -# - -all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES) - -.PRECIOUS: $(PGMS) - -EXTRA_DIST = $(C_FILES) +include ../rel.am include $(top_srcdir)/../../../automake/local.am -- cgit v1.2.3