From c5fff113a953b72c8924117e990382337770bf0a Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 18 Dec 2001 14:12:25 +0000 Subject: 2001-12-18 Ralf Corsepius * automake/multilib.am: include @RTEMS_BSP@.cfg, cleanup. * automake/lib.am: Add MULTISUBDIR. --- automake/lib.am | 4 ++-- automake/multilib.am | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) (limited to 'automake') diff --git a/automake/lib.am b/automake/lib.am index 8fbea532de..7cb9db1148 100644 --- a/automake/lib.am +++ b/automake/lib.am @@ -14,9 +14,9 @@ $(AR) $(ARFLAGS) $@ $^ $(RANLIB) $@ endef -$(PROJECT_RELEASE)/lib: +$(PROJECT_RELEASE)/lib$(MULTISUBDIR): @$(mkinstalldirs) $@ -TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib +TMPINSTALL_FILES = $(PROJECT_RELEASE)/lib$(MULTISUBDIR) .PRECIOUS: $(LIB) diff --git a/automake/multilib.am b/automake/multilib.am index 164fc82fe9..37a6086616 100644 --- a/automake/multilib.am +++ b/automake/multilib.am @@ -1,18 +1,17 @@ ## $Id$ -# Multilib support variables. +if MULTILIB MULTISRCTOP = -MULTIBUILDTOP = MULTIDIRS = -MULTISUBDIR = MULTIDO = true MULTICLEAN = true - +endif # Multilib support rules .PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \ maintainer-clean-multi +if MULTILIB all-recursive: all-multi mostlyclean-recursive: mostlyclean-multi clean-recursive: clean-multi @@ -29,3 +28,6 @@ distclean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=distclean multi-clean maintainer-clean-multi: $(MULTICLEAN) $(AM_MAKEFLAGS) DO=maintainer-clean multi-clean +else +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +endif -- cgit v1.2.3