2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* wrapup/Makefile.am: Use .$(OBJEXT) instead of .o.
This commit is contained in:
Ralf Corsepius
2002-07-22 13:58:30 +00:00
parent 38ae496ee8
commit 305dd8bd82
2 changed files with 10 additions and 6 deletions

View File

@@ -1,3 +1,7 @@
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Use .$(OBJEXT) instead of .o.
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Use project_libdir instead of * wrapup/Makefile.am: Use project_libdir instead of

View File

@@ -8,10 +8,10 @@ include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am include $(top_srcdir)/automake/lib.am
CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.o) CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.$(OBJEXT))
CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.o) CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.$(OBJEXT))
SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.o) SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.$(OBJEXT))
RTEMS_OBJS = $(wildcard ../rtems/src/$(ARCH)/*.o) RTEMS_OBJS = $(wildcard ../rtems/src/$(ARCH)/*.$(OBJEXT))
if HAS_POSIX if HAS_POSIX
POSIX_OBJS = ../posix/src/$(ARCH)/libposix.a POSIX_OBJS = ../posix/src/$(ARCH)/libposix.a
@@ -47,7 +47,7 @@ $(LIB): ${OBJS}
rm -rf $(ARCH)/* rm -rf $(ARCH)/*
for f in $(OBJS); do \ for f in $(OBJS); do \
case $$f in \ case $$f in \
*.o | *.rel) \ *.$(OBJEXT) | *.rel) \
if test -f $(ARCH)/`basename $$f`; then \ if test -f $(ARCH)/`basename $$f`; then \
if cmp $$f $(ARCH)/`basename $$f`; then \ if cmp $$f $(ARCH)/`basename $$f`; then \
true; \ true; \
@@ -70,7 +70,7 @@ $(LIB): ${OBJS}
done done
test -d $(project_libdir)$(MULTISUBDIR) || $(mkinstalldirs) $(project_libdir)$(MULTISUBDIR) test -d $(project_libdir)$(MULTISUBDIR) || $(mkinstalldirs) $(project_libdir)$(MULTISUBDIR)
$(AR) rc $@ $(ARCH)/* $(AR) rc $@ $(ARCH)/*
rm -f $(ARCH)/*.o rm -f $(ARCH)/*.$(OBJEXT)
$(RANLIB) $@ $(RANLIB) $@
TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a