From 20996955edf891a3bd4f297e29b756b2038661c4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 11 Dec 2002 18:20:02 +0000 Subject: 2002-12-11 Ralf Corsepius * Makefile.am: Eliminate *_O_FILES. Don't create $ARCH in %.o: %.c rules. --- c/src/optman/ChangeLog | 5 +++++ c/src/optman/Makefile.am | 9 +++------ 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'c/src/optman') diff --git a/c/src/optman/ChangeLog b/c/src/optman/ChangeLog index 58cc3ebe2e..fe61ec202d 100644 --- a/c/src/optman/ChangeLog +++ b/c/src/optman/ChangeLog @@ -1,3 +1,8 @@ +2002-12-11 Ralf Corsepius + + * Makefile.am: Eliminate *_O_FILES. + Don't create $ARCH in %.o: %.c rules. + 2002-12-11 Ralf Corsepius * Makefile.am: Use .$(OBJEXT) instead of .o. diff --git a/c/src/optman/Makefile.am b/c/src/optman/Makefile.am index df38993204..0ab4c2ee73 100644 --- a/c/src/optman/Makefile.am +++ b/c/src/optman/Makefile.am @@ -8,27 +8,24 @@ include $(top_srcdir)/../../../automake/compile.am include $(top_srcdir)/../../../automake/lib.am sapi_C_FILES = sapi/no-ext.c sapi/no-io.c -C_O_FILES = $(sapi_C_FILES:sapi/%.c=$(ARCH)/%.$(OBJEXT)) +OBJS = $(sapi_C_FILES:sapi/%.c=$(ARCH)/%.$(OBJEXT)) rtems_C_FILES = rtems/no-dpmem.c rtems/no-event.c rtems/no-msg.c rtems/no-mp.c \ rtems/no-part.c rtems/no-region.c \ rtems/no-rtmon.c rtems/no-sem.c rtems/no-signal.c rtems/no-timer.c -C_O_FILES += $(rtems_C_FILES:rtems/%.c=${ARCH}/%.$(OBJEXT)) +OBJS += $(rtems_C_FILES:rtems/%.c=${ARCH}/%.$(OBJEXT)) PGMS = $(rtems_C_FILES:rtems/%.c=$(ARCH)/%$(LIB_VARIANT).rel) PGMS += $(sapi_C_FILES:sapi/%.c=$(ARCH)/%$(LIB_VARIANT).rel) ${ARCH}/%.$(OBJEXT): sapi/%.c - test -d $(ARCH) || mkdir $(ARCH) ${COMPILE} -o $@ -c $< ${ARCH}/%.$(OBJEXT): rtems/%.c - test -d $(ARCH) || mkdir $(ARCH) ${COMPILE} -o $@ -c $< # Make foo.rel from foo.o ${ARCH}/%$(LIB_VARIANT).rel: ${ARCH}/%.o - test -d $(ARCH) || mkdir $(ARCH) ${make-rel} bsplib_DATA = $(PGMS) @@ -41,7 +38,7 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%$(LIB_VARIANT).rel all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES) -.PRECIOUS: $(PGMS) $(C_O_FILES) +.PRECIOUS: $(PGMS) $(OBJS) EXTRA_DIST = $(rtems_C_FILES) $(sapi_C_FILES) -- cgit v1.2.3