2003-11-30 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* automake/compile.am: Add $(ARCH)/$(dirstamp) rules.
	* wrapup/Makefile.am: Reflect $(dirstamp) changes.
This commit is contained in:
Ralf Corsepius
2003-12-01 04:10:53 +00:00
parent 8d46f4f3a4
commit 5ef82f9716
3 changed files with 15 additions and 7 deletions

View File

@@ -1,3 +1,8 @@
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.

View File

@@ -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 =

View File

@@ -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)