From 35b22754c2772843c7ccf9818a86d5dc1d36efe8 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 22 Jul 2002 09:17:40 +0000 Subject: 2002-07-22 Ralf Corsepius * aclocal/bsp-configure.m4: Add RTEMS_CHECK_MULTIPROCESSING. * automake/compile.am: Add test -d $(ARCH) || mkdir $(ARCH) to all compilation rules (Work-around to an automake bug). * automake/lib.am: Add test -d $(ARCH) || mkdir $(ARCH) to make-library. --- ChangeLog | 8 ++++++++ aclocal/bsp-configure.m4 | 2 ++ automake/compile.am | 7 +++++++ automake/lib.am | 5 +++-- 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0822c6a038..3e3093c324 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2002-07-22 Ralf Corsepius + + * aclocal/bsp-configure.m4: Add RTEMS_CHECK_MULTIPROCESSING. + * automake/compile.am: Add test -d $(ARCH) || mkdir $(ARCH) to all + compilation rules (Work-around to an automake bug). + * automake/lib.am: Add test -d $(ARCH) || mkdir $(ARCH) to + make-library. + 2002-07-22 Ralf Corsepius * configure.ac: Activate cpukit. Remove references to c/src/exec. diff --git a/aclocal/bsp-configure.m4 b/aclocal/bsp-configure.m4 index 9959621799..71a41a2083 100644 --- a/aclocal/bsp-configure.m4 +++ b/aclocal/bsp-configure.m4 @@ -14,4 +14,6 @@ AC_DEFUN([RTEMS_BSP_CONFIGURE], RTEMS_CANONICAL_HOST AM_CONFIG_HEADER([include/bspopts.h]) RTEMS_PROJECT_ROOT + + RTEMS_CHECK_MULTIPROCESSING ]) diff --git a/automake/compile.am b/automake/compile.am index 22eb1bd2bc..0248c2f2e5 100644 --- a/automake/compile.am +++ b/automake/compile.am @@ -107,25 +107,32 @@ AS = $(CC) ASCOMPILE = $(AS) $(AM_ASFLAGS) $(ASFLAGS) ${ARCH}/%.o: %.c + test -d $(ARCH) || mkdir $(ARCH) ${COMPILE} -o $@ -c $< ${ARCH}/%.o: %.cc + test -d $(ARCH) || mkdir $(ARCH) ${CXXCOMPILE} -o $@ -c $< ${ARCH}/%.o: %.cpp + test -d $(ARCH) || mkdir $(ARCH) ${CXXCOMPILE} -o $@ -c $< ${ARCH}/%.o: %.cxx + test -d $(ARCH) || mkdir $(ARCH) ${CXXCOMPILE} -o $@ -c $< ${ARCH}/%.o: %.C + test -d $(ARCH) || mkdir $(ARCH) ${CXXCOMPILE} -o $@ -c $< ${ARCH}/%.o: %.S + test -d $(ARCH) || mkdir $(ARCH) ${ASCOMPILE} -DASM -o $@ -c $< # Make foo.rel from foo.o ${ARCH}/%.rel: ${ARCH}/%.o + test -d $(ARCH) || mkdir $(ARCH) ${make-rel} # Dependency files for use by gmake diff --git a/automake/lib.am b/automake/lib.am index 7cb9db1148..cebdc20377 100644 --- a/automake/lib.am +++ b/automake/lib.am @@ -9,14 +9,15 @@ RANLIB = @RANLIB@ ARFLAGS = ruv define make-library +test -d $(ARCH) || mkdir $(ARCH) $(RM) $@ $(AR) $(ARFLAGS) $@ $^ $(RANLIB) $@ endef -$(PROJECT_RELEASE)/lib$(MULTISUBDIR): +$(PROJECT_RELEASE)/lib: @$(mkinstalldirs) $@ -TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib$(MULTISUBDIR) +TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib .PRECIOUS: $(LIB) -- cgit v1.2.3