diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-01 04:10:53 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-12-01 04:10:53 +0000 |
commit | 5ef82f9716844ce4b24a9d6fd5280ea14e2e17f7 (patch) | |
tree | 9ebc93b032eafff834070ed417ade61183c14a33 /cpukit | |
parent | 2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-5ef82f9716844ce4b24a9d6fd5280ea14e2e17f7.tar.bz2 |
2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/compile.am: Add $(ARCH)/$(dirstamp) rules.
* wrapup/Makefile.am: Reflect $(dirstamp) changes.
Diffstat (limited to 'cpukit')
-rw-r--r-- | cpukit/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/automake/compile.am | 9 | ||||
-rw-r--r-- | cpukit/wrapup/Makefile.am | 8 |
3 files changed, 15 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index b3b1195867..b790d59677 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,10 @@ 2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * automake/compile.am: Add $(ARCH)/$(dirstamp) rules. + * wrapup/Makefile.am: Reflect $(dirstamp) changes. + +2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + * Makefile.am: Add $(dirstamp) to preinstallation rules. 2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de> diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am index eb5b1435ef..6f4627f68c 100644 --- a/cpukit/automake/compile.am +++ b/cpukit/automake/compile.am @@ -56,10 +56,10 @@ CCLD = $(CC) CCASCOMPILE = $(CCAS) $(AM_CCASFLAGS) $(CCASFLAGS) -${ARCH}/%.$(OBJEXT): %.c +${ARCH}/%.$(OBJEXT): %.c $(ARCH)/$(dirstamp) ${COMPILE} -o $@ -c $< -${ARCH}/%.$(OBJEXT): %.S +${ARCH}/%.$(OBJEXT): %.S $(ARCH)/$(dirstamp) ${CCASCOMPILE} -o $@ -c $< # Make foo.rel from foo.$(OBJEXT) @@ -116,8 +116,9 @@ ARCH_DEBUG_V = o-debug ARCH__V = $(ARCH_OPTIMIZE_V) ARCH = $(ARCH_$(VARIANT_V)_V) -${ARCH}: - mkdir ${ARCH} +${ARCH}/$(dirstamp): + @$(mkinstalldirs) $(ARCH) + @: > $(ARCH)/$(dirstamp) ## Setup the library suffix LIBSUFFIX_OPTIMIZE_V = diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index d37b5c2687..7869898c31 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -66,9 +66,11 @@ LIBS += ../librpc/src/rpc/$(ARCH)/librpc.a LIBS += ../librpc/src/xdr/$(ARCH)/libxdr.a endif +$(LIBS): $(ARCH)/$(dirstamp) + $(LIB): ${LIBS} rm -f $@ - rm -rf $(ARCH)/* + rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel for f in $(LIBS); do \ case $$f in \ *.$(OBJEXT) | *.rel) \ @@ -94,12 +96,12 @@ $(LIB): ${LIBS} done test -d $(project_libdir) || $(mkinstalldirs) $(project_libdir) $(AR) rc $@ $(ARCH)/* - rm -f $(ARCH)/*.$(OBJEXT) + rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel $(RANLIB) $@ TMPINSTALL_FILES += $(project_libdir)/librtemscpu$(LIB_VARIANT).a -all-am: $(ARCH) $(LIB) $(TMPINSTALL_FILES) +all-am: $(LIB) $(TMPINSTALL_FILES) install-data-hook: $(LIB) @$(mkinstalldirs) $(DESTDIR)$(libdir) |