RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

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

Browse Source 
* wrapup/Makefile.am: Use project_libdir instead of
	$(PROJECT_RELEASE)/lib. Eliminate LIBNAME. Pickup *.o's instead of
	*.rels for CPU_OBJS. Manually create $(project_libdir)$(MULTISUBDIR).
This commit is contained in:
Ralf Corsepius
2002-07-22 09:56:13 +00:00
parent 17e97568ca
commit 405c7d129a
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cpukit/ChangeLog
View File

@@ -1,3 +1,9 @@
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Use project_libdir instead of
$(PROJECT_RELEASE)/lib. Eliminate LIBNAME. Pickup *.o's instead of
*.rels for CPU_OBJS. Manually create $(project_libdir)$(MULTISUBDIR).
2002-07-22 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* automake/lib.am: Use project_libdir instead of

11
cpukit/wrapup/Makefile.am
View File

@@ -2,15 +2,13 @@
## $Id$
##
LIBNAME = librtemscpu
LIB = $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
LIB = $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.rel)
CPU_OBJS = $(wildcard ../score/cpu/$(RTEMS_CPU)/$(ARCH)/*.o)
CORE_OBJS = $(wildcard ../score/src/$(ARCH)/*.o)
SAPI_OBJS = $(wildcard ../sapi/src/$(ARCH)/*.o)
RTEMS_OBJS = $(wildcard ../rtems/src/$(ARCH)/*.o)
@@ -70,13 +68,14 @@ $(LIB): ${OBJS}
;; \
esac; \
done
test -d $(project_libdir)$(MULTISUBDIR) || $(mkinstalldirs) $(project_libdir)$(MULTISUBDIR)
$(AR) rc $@ $(ARCH)/*
rm -f $(ARCH)/*.o
$(RANLIB) $@
TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a
TMPINSTALL_FILES += $(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a
#$(PROJECT_RELEASE)/lib$(MULTISUBDIR)/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
#$(project_libdir)$(MULTISUBDIR)/librtemscpu$(LIB_VARIANT).a: $(LIB)
# $(INSTALL_DATA) $< $@
cpulibdir = $(libdir)