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

2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

Browse Source 
* wrapup/Makefile.am: Include compile.am.
	Use TMP_LIBS instead of LIBS to avoid potential conflicts with
	auto*tools' LIBS.
	Reflect new locations of libscorecpu*.a
This commit is contained in:
Ralf Corsepius
2004-01-11 05:50:53 +00:00
parent bf9ea48bbd
commit b178462c4c
2 changed files with 41 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/ChangeLog
View File

@@ -1,3 +1,10 @@
2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* wrapup/Makefile.am: Include compile.am.
Use TMP_LIBS instead of LIBS to avoid potential conflicts with
auto*tools' LIBS.
Reflect new locations of libscorecpu*.a
2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de> 2004-01-11 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Remove AUTOMAKE_FILES. * Makefile.am: Remove AUTOMAKE_FILES.

68
cpukit/wrapup/Makefile.am
View File

@@ -3,7 +3,7 @@
## ##
include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/multilib.am
include $(top_srcdir)/automake/amcompile.am include $(top_srcdir)/automake/compile.am
## Setup the variant build subdirectory ## Setup the variant build subdirectory
ARCH_OPTIMIZE_V = o-optimize ARCH_OPTIMIZE_V = o-optimize
@@ -17,71 +17,71 @@ ${ARCH}/$(dirstamp):
@: > $(ARCH)/$(dirstamp) @: > $(ARCH)/$(dirstamp)
project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a
CLEANFILES = o-optimize/librtemscpu.a
CLEANFILES += o-debug/librtemscpu_g.a
LIBS = TMP_LIBS =
if LIBSCORECPU if LIBSCORECPU
LIBS += ../score/cpu/$(RTEMS_CPU)/$(ARCH)/libscorecpu.a TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu$(LIB_VARIANT).a
endif endif
LIBS += ../score/libscore$(LIB_VARIANT).a TMP_LIBS += ../score/libscore$(LIB_VARIANT).a
LIBS += ../sapi/libsapi$(LIB_VARIANT).a TMP_LIBS += ../sapi/libsapi$(LIB_VARIANT).a
LIBS += ../rtems/librtems$(LIB_VARIANT).a TMP_LIBS += ../rtems/librtems$(LIB_VARIANT).a
if HAS_POSIX if HAS_POSIX
LIBS += ../posix/libposix$(LIB_VARIANT).a TMP_LIBS += ../posix/libposix$(LIB_VARIANT).a
endif endif
if HAS_ITRON if HAS_ITRON
LIBS += ../itron/libitron$(LIB_VARIANT).a TMP_LIBS += ../itron/libitron$(LIB_VARIANT).a
endif endif
LIBS += ../libcsupport/libcsupport$(LIB_VARIANT).a TMP_LIBS += ../libcsupport/libcsupport$(LIB_VARIANT).a
LIBS += ../libblock/libblock$(LIB_VARIANT).a TMP_LIBS += ../libblock/libblock$(LIB_VARIANT).a
if !UNIX if !UNIX
LIBS += ../libfs/libdosfs$(LIB_VARIANT).a TMP_LIBS += ../libfs/libdosfs$(LIB_VARIANT).a
endif endif
LIBS += ../libfs/libimfs$(LIB_VARIANT).a TMP_LIBS += ../libfs/libimfs$(LIB_VARIANT).a
LIBS += ../libmisc/libmonitor$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libmonitor$(LIB_VARIANT).a
LIBS += ../libmisc/libuntar$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libuntar$(LIB_VARIANT).a
LIBS += ../libmisc/libstackchk$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libstackchk$(LIB_VARIANT).a
LIBS += ../libmisc/libcpuuse$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libcpuuse$(LIB_VARIANT).a
LIBS += ../libmisc/librtmonuse$(LIB_VARIANT).a TMP_LIBS += ../libmisc/librtmonuse$(LIB_VARIANT).a
## XXX temporarily removed because it causes a ## XXX temporarily removed because it causes a
## XXX number of BSPs to not link "main(){}" used by autoconf ## XXX number of BSPs to not link "main(){}" used by autoconf
# if LIBSERDBG # if LIBSERDBG
# LIBS += ../libmisc/libserdbg$(LIB_VARIANT).a # TMP_LIBS += ../libmisc/libserdbg$(LIB_VARIANT).a
# endif # endif
if LIBSHELL if LIBSHELL
LIBS += ../libmisc/libshell$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libshell$(LIB_VARIANT).a
endif endif
LIBS += ../libmisc/libdumpbuf$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libdumpbuf$(LIB_VARIANT).a
LIBS += ../libmisc/libdevnull$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libdevnull$(LIB_VARIANT).a
LIBS += ../libmisc/libdummy$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libdummy$(LIB_VARIANT).a
LIBS += ../libmisc/libmw-fb$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libmw-fb$(LIB_VARIANT).a
LIBS += ../libmisc/libcapture$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libcapture$(LIB_VARIANT).a
LIBS += ../libmisc/libfsmount$(LIB_VARIANT).a TMP_LIBS += ../libmisc/libfsmount$(LIB_VARIANT).a
if HAS_NETWORKING if HAS_NETWORKING
LIBS += ../libnetworking/libnetworking$(LIB_VARIANT).a TMP_LIBS += ../libnetworking/libnetworking$(LIB_VARIANT).a
LIBS += ../libnetworking/libc$(LIB_VARIANT).a TMP_LIBS += ../libnetworking/libc$(LIB_VARIANT).a
LIBS += ../libnetworking/lib$(LIB_VARIANT).a TMP_LIBS += ../libnetworking/lib$(LIB_VARIANT).a
endif endif
if LIBRPC if LIBRPC
LIBS += ../librpc/librpc$(LIB_VARIANT).a TMP_LIBS += ../librpc/librpc$(LIB_VARIANT).a
LIBS += ../librpc/libxdr$(LIB_VARIANT).a TMP_LIBS += ../librpc/libxdr$(LIB_VARIANT).a
endif endif
$(LIBS): $(ARCH)/$(dirstamp) $(ARCH)/librtemscpu$(LIB_VARIANT).a: $(TMP_LIBS) $(ARCH)/$(dirstamp)
$(ARCH)/librtemscpu$(LIB_VARIANT).a: ${LIBS}
rm -f $@ rm -f $@
rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
for f in $(LIBS); do \ for f in $(TMP_LIBS); do \
case $$f in \ case $$f in \
*.$(OBJEXT) | *.rel) \ *.$(OBJEXT) | *.rel) \
if test -f $(ARCH)/`basename $$f`; then \ if test -f $(ARCH)/`basename $$f`; then \