diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 15:48:45 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2004-01-09 15:48:45 +0000 |
commit | f670eb767bc2dc8da9844fe6971363aa7f9dc58b (patch) | |
tree | 73c595dfa0c0abd9fd4bab3b5ba4cc07eae61175 | |
parent | 2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-f670eb767bc2dc8da9844fe6971363aa7f9dc58b.tar.bz2 |
2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Build lib*$(LIB_VARIANT).a instead of
$(ARCH)/lib*.a.
-rw-r--r-- | cpukit/libfs/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libfs/Makefile.am | 29 | ||||
-rw-r--r-- | cpukit/libmisc/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libmisc/Makefile.am | 191 | ||||
-rw-r--r-- | cpukit/libnetworking/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/libnetworking/Makefile.am | 78 | ||||
-rw-r--r-- | cpukit/librpc/ChangeLog | 5 | ||||
-rw-r--r-- | cpukit/librpc/Makefile.am | 32 |
8 files changed, 177 insertions, 173 deletions
diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index f7ce69d887..34996f0601 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build lib*$(LIB_VARIANT).a instead of + $(ARCH)/lib*.a. + 2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 962e5d4fb9..9b3e6542d9 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -37,17 +37,17 @@ else libimfs_C_FILES = $(libimfs_EMBEDDED_C_FILES) endif -EXTRA_LIBRARIES = o-optimize/libimfs.a -o_optimize_libimfs_a_SOURCES = $(libimfs_C_FILES) -o_optimize_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES = libimfs.a +libimfs_a_SOURCES = $(libimfs_C_FILES) +libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libimfs.a -o_debug_libimfs_a_SOURCES = $(libimfs_C_FILES) -o_debug_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libimfs_g.a +libimfs_g_a_SOURCES = $(libimfs_C_FILES) +libimfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) include_HEADERS += src/imfs/imfs.h -IMFSLIB = $(ARCH)/libimfs.a +IMFSLIB = libimfs$(LIB_VARIANT).a # dosfs @@ -69,16 +69,15 @@ libdosfs_C_FILES = $(libdosfs_FATFS_C_FILES) $(libdosfs_DOSFS_C_FILES) include_HEADERS += src/dosfs/dosfs.h -DOSFSLIB = $(ARCH)/libdosfs.a +DOSFSLIB = libdosfs$(LIB_VARIANT).a -EXTRA_LIBRARIES += o-optimize/libdosfs.a -o_optimize_libdosfs_a_SOURCES = $(libdosfs_C_FILES) -o_optimize_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) - -EXTRA_LIBRARIES += o-debug/libdosfs.a -o_debug_libdosfs_a_SOURCES = $(libdosfs_C_FILES) -o_debug_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libdosfs.a +libdosfs_a_SOURCES = $(libdosfs_C_FILES) +libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libdosfs_g.a +libdosfs_g_a_SOURCES = $(libdosfs_C_FILES) +libdosfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) endif all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB) diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index 9420aa5a0d..811917ef95 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/libmisc/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build lib*$(LIB_VARIANT).a instead of + $(ARCH)/lib*.a. + 2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index fb5df727aa..b44c4cfc0a 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -19,79 +19,75 @@ TMP_LIBS = libcapture_C_FILES = capture/capture.c capture/capture-cli.c include_rtems_HEADERS += capture/capture.h capture/capture-cli.h -EXTRA_LIBRARIES += o-optimize/libcapture.a -o_optimize_libcapture_a_SOURCES = $(libcapture_C_FILES) -o_optimize_libcapture_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libcapture.a +libcapture_a_SOURCES = $(libcapture_C_FILES) +libcapture_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libcapture.a -o_debug_libcapture_a_SOURCES = $(libcapture_C_FILES) -o_debug_libcapture_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libcapture_g.a +libcapture_g_a_SOURCES = $(libcapture_C_FILES) +libcapture_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libcapture.a +TMP_LIBS += libcapture$(LIB_VARIANT).a ## cpuuse libcpuuse_C_FILES = cpuuse/cpuuse.c include_rtems_HEADERS += cpuuse/cpuuse.h -EXTRA_LIBRARIES += o-optimize/libcpuuse.a -o_optimize_libcpuuse_a_SOURCES = $(libcpuuse_C_FILES) -o_optimize_libcpuuse_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libcpuuse.a +libcpuuse_a_SOURCES = $(libcpuuse_C_FILES) +libcpuuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libcpuuse.a -o_debug_libcpuuse_a_SOURCES = $(libcpuuse_C_FILES) -o_debug_libcpuuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libcpuuse_g.a +libcpuuse_g_a_SOURCES = $(libcpuuse_C_FILES) +libcpuuse_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libcpuuse.a +TMP_LIBS += libcpuuse$(LIB_VARIANT).a ## devnull libdevnull_C_FILES = devnull/devnull.c include_rtems_HEADERS += devnull/devnull.h -EXTRA_LIBRARIES += o-optimize/libdevnull.a -o_optimize_libdevnull_a_SOURCES = $(libdevnull_C_FILES) -o_optimize_libdevnull_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libdevnull.a +libdevnull_a_SOURCES = $(libdevnull_C_FILES) +libdevnull_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libdevnull.a -o_debug_libdevnull_a_SOURCES = $(libdevnull_C_FILES) -o_debug_libdevnull_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libdevnull_g.a +libdevnull_g_a_SOURCES = $(libdevnull_C_FILES) +libdevnull_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libdevnull.a +TMP_LIBS += libdevnull$(LIB_VARIANT).a ## dummy libdummy_C_FILES = dummy/dummy.c EXTRA_DIST += dummy/README -EXTRA_LIBRARIES += o-optimize/libdummy.a -o_optimize_libdummy_a_SOURCES = $(libdummy_C_FILES) -o_optimize_libdummy_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libdummy.a +libdummy_a_SOURCES = $(libdummy_C_FILES) +libdummy_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libdummy.a -o_debug_libdummy_a_SOURCES = $(libdummy_C_FILES) -o_debug_libdummy_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libdummy_g.a +libdummy_g_a_SOURCES = $(libdummy_C_FILES) +libdummy_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libdummy.a +TMP_LIBS += libdummy$(LIB_VARIANT).a ## dumpbuf libdumpbuf_C_FILES = dumpbuf/dumpbuf.c include_rtems_HEADERS += dumpbuf/dumpbuf.h -EXTRA_LIBRARIES += o-optimize/libdumpbuf.a -o_optimize_libdumpbuf_a_SOURCES = $(libdumpbuf_C_FILES) -o_optimize_libdumpbuf_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libdumpbuf.a +libdumpbuf_a_SOURCES = $(libdumpbuf_C_FILES) +libdumpbuf_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libdumpbuf.a -o_debug_libdumpbuf_a_SOURCES = $(libdumpbuf_C_FILES) -o_debug_libdumpbuf_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libdumpbuf_g.a +libdumpbuf_g_a_SOURCES = $(libdumpbuf_C_FILES) +libdumpbuf_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libdumpbuf.a +TMP_LIBS += libdumpbuf$(LIB_VARIANT).a ## monitor @@ -107,33 +103,32 @@ if HAS_MP libmonitor_C_FILES += monitor/mon-mpci.c endif -EXTRA_LIBRARIES += o-optimize/libmonitor.a -o_optimize_libmonitor_a_SOURCES = $(libmonitor_C_FILES) -o_optimize_libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libmonitor.a +libmonitor_a_SOURCES = $(libmonitor_C_FILES) +libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libmonitor.a -o_debug_libmonitor_a_SOURCES = $(libmonitor_C_FILES) -o_debug_libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libmonitor_g.a +libmonitor_g_a_SOURCES = $(libmonitor_C_FILES) +libmonitor_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) EXTRA_DIST += monitor/README -TMP_LIBS += $(ARCH)/libmonitor.a +TMP_LIBS += libmonitor$(LIB_VARIANT).a ## mw-fb libmw_fb_C_FILES = mw-fb/mw_fb.c mw-fb/mw_uid.c include_rtems_HEADERS += mw-fb/mw_fb.h mw-fb/mw_uid.h -EXTRA_LIBRARIES += o-optimize/libmw-fb.a -o_optimize_libmw_fb_a_SOURCES = $(libmw_fb_C_FILES) -o_optimize_libmw_fb_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libmw-fb.a +libmw_fb_a_SOURCES = $(libmw_fb_C_FILES) +libmw_fb_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libmw-fb.a -o_debug_libmw_fb_a_SOURCES = $(libmw_fb_C_FILES) -o_debug_libmw_fb_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libmw-fb_g.a +libmw_fb_g_a_SOURCES = $(libmw_fb_C_FILES) +libmw_fb_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libmw-fb.a +TMP_LIBS += libmw-fb$(LIB_VARIANT).a ## shell @@ -141,15 +136,15 @@ if LIBSHELL include_rtems_HEADERS += shell/shell.h libshell_C_FILES = shell/cmds.c shell/shell.c -EXTRA_LIBRARIES += o-optimize/libshell.a -o_optimize_libshell_a_SOURCES = $(libshell_C_FILES) -o_optimize_libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libshell.a +libshell_a_SOURCES = $(libshell_C_FILES) +libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libshell.a -o_debug_libshell_a_SOURCES = $(libshell_C_FILES) -o_debug_libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libshell_g.a +libshell_g_a_SOURCES = $(libshell_C_FILES) +libshell_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libshell.a +TMP_LIBS += libshell$(LIB_VARIANT).a endif EXTRA_DIST += shell/README @@ -159,16 +154,15 @@ EXTRA_DIST += shell/README librtmonuse_C_FILES = rtmonuse/rtmonuse.c include_rtems_HEADERS += rtmonuse/rtmonuse.h -EXTRA_LIBRARIES += o-optimize/librtmonuse.a -o_optimize_librtmonuse_a_SOURCES = $(librtmonuse_C_FILES) -o_optimize_librtmonuse_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += librtmonuse.a +librtmonuse_a_SOURCES = $(librtmonuse_C_FILES) +librtmonuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/librtmonuse.a -o_debug_librtmonuse_a_SOURCES = $(librtmonuse_C_FILES) -o_debug_librtmonuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += librtmonuse_g.a +librtmonuse_g_a_SOURCES = $(librtmonuse_C_FILES) +librtmonuse_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/librtmonuse.a +TMP_LIBS += librtmonuse$(LIB_VARIANT).a ## serdbg @@ -179,16 +173,15 @@ include_HEADERS += serdbg/serdbgcnf.h serdbg/serdbg.h \ libserdbg_C_FILES = serdbg/serdbg.c serdbg/serdbgio.c \ serdbg/termios_printk.c -EXTRA_LIBRARIES += o-optimize/libserdbg.a -o_optimize_libserdbg_a_SOURCES = $(libserdbg_C_FILES) -o_optimize_libserdbg_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libserdbg.a +libserdbg_a_SOURCES = $(libserdbg_C_FILES) +libserdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libserdbg.a -o_debug_libserdbg_a_SOURCES = $(libserdbg_C_FILES) -o_debug_libserdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libserdbg_g.a +libserdbg_g_a_SOURCES = $(libserdbg_C_FILES) +libserdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libserdbg.a +TMP_LIBS += libserdbg$(LIB_VARIANT).a endif EXTRA_DIST += serdbg/README @@ -198,16 +191,15 @@ EXTRA_DIST += serdbg/README include_rtems_HEADERS += stackchk/stackchk.h libstackchk_C_FILES = stackchk/check.c stackchk/internal.h -EXTRA_LIBRARIES += o-optimize/libstackchk.a -o_optimize_libstackchk_a_SOURCES = $(libstackchk_C_FILES) -o_optimize_libstackchk_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libstackchk.a +libstackchk_a_SOURCES = $(libstackchk_C_FILES) +libstackchk_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libstackchk.a -o_debug_libstackchk_a_SOURCES = $(libstackchk_C_FILES) -o_debug_libstackchk_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libstackchk_g.a +libstackchk_g_a_SOURCES = $(libstackchk_C_FILES) +libstackchk_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libstackchk.a +TMP_LIBS += libstackchk$(LIB_VARIANT).a EXTRA_DIST += stackchk/README ## libuntar @@ -215,15 +207,15 @@ EXTRA_DIST += stackchk/README include_rtems_HEADERS += untar/untar.h libuntar_C_FILES = untar/untar.c -EXTRA_LIBRARIES += o-optimize/libuntar.a -o_optimize_libuntar_a_SOURCES = $(libuntar_C_FILES) -o_optimize_libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libuntar.a +libuntar_a_SOURCES = $(libuntar_C_FILES) +libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libuntar.a -o_debug_libuntar_a_SOURCES = $(libuntar_C_FILES) -o_debug_libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libuntar_g.a +libuntar_g_a_SOURCES = $(libuntar_C_FILES) +libuntar_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libuntar.a +TMP_LIBS += libuntar$(LIB_VARIANT).a EXTRA_DIST += untar/README @@ -232,16 +224,15 @@ EXTRA_DIST += untar/README libfsmount_C_FILES = fsmount/fsmount.c include_rtems_HEADERS += fsmount/fsmount.h -EXTRA_LIBRARIES += o-optimize/libfsmount.a -o_optimize_libfsmount_a_SOURCES = $(libfsmount_C_FILES) -o_optimize_libfsmount_a_CPPFLAGS = $(AM_CPPFLAGS) \ - $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES += libfsmount.a +libfsmount_a_SOURCES = $(libfsmount_C_FILES) +libfsmount_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libfsmount.a -o_debug_libfsmount_a_SOURCES = $(libfsmount_C_FILES) -o_debug_libfsmount_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libfsmount_g.a +libfsmount_g_a_SOURCES = $(libfsmount_C_FILES) +libfsmount_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -TMP_LIBS += $(ARCH)/libfsmount.a +TMP_LIBS += libfsmount$(LIB_VARIANT).a EXTRA_DIST += fsmount/README diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index 976c4b3bae..03b7c3c7d9 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build lib*$(LIB_VARIANT).a instead of + $(ARCH)/lib*.a. + 2004-01-07 Joel Sherrill <joel@OARcorp.com> * rtems/rtems_bsdnet_internal.h: Include rtems/cdefs.h so things diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index 9e14f5d6bd..59a08457e8 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -15,17 +15,17 @@ if HAS_NETWORKING libnetworking_CPPFLAGS = -D_COMPILING_BSD_KERNEL_ -DKERNEL -DINET -DNFS \ -DDIAGNOSTIC -DBOOTP_COMPAT -EXTRA_LIBRARIES = o-optimize/libnetworking.a -o_optimize_libnetworking_a_SOURCES = -o_optimize_libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ -$(libnetworking_CPPFLAGS) +EXTRA_LIBRARIES = libnetworking.a +libnetworking_a_SOURCES = +libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ + $(libnetworking_CPPFLAGS) -EXTRA_LIBRARIES += o-debug/libnetworking.a -o_debug_libnetworking_a_SOURCES = -o_debug_libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ -$(libnetworking_CPPFLAGS) +EXTRA_LIBRARIES += libnetworking_g.a +libnetworking_g_a_SOURCES = +libnetworking_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ + $(libnetworking_CPPFLAGS) -TMP_LIBS = $(ARCH)/libnetworking.a +TMP_LIBS = libnetworking$(LIB_VARIANT).a ## poll.h is not in the list because RTEMS does not have poll() ## and installing poll.h confuses autoconf. @@ -44,8 +44,8 @@ include_arpa_HEADERS = arpa/ftp.h arpa/inet.h arpa/nameser.h \ kern_C_FILES = kern/kern_mib.c kern/kern_subr.c kern/kern_sysctl.c \ kern/uipc_domain.c kern/uipc_mbuf.c kern/uipc_socket.c \ kern/uipc_socket2.c -o_optimize_libnetworking_a_SOURCES += $(kern_C_FILES) -o_debug_libnetworking_a_SOURCES += $(kern_C_FILES) +libnetworking_a_SOURCES += $(kern_C_FILES) +libnetworking_g_a_SOURCES += $(kern_C_FILES) ## machine @@ -66,8 +66,8 @@ include_net_HEADERS = net/bpf.h net/ethernet.h net/if.h net/if_arp.h \ net_C_FILES = net/if.c net/if_ethersubr.c net/if_loop.c net/radix.c \ net/route.c net/rtsock.c net/raw_cb.c net/raw_usrreq.c net/if_ppp.c \ net/ppp_tty.c net/pppcompress.c -o_optimize_libnetworking_a_SOURCES += $(net_C_FILES) -o_debug_libnetworking_a_SOURCES += $(net_C_FILES) +libnetworking_a_SOURCES += $(net_C_FILES) +libnetworking_g_a_SOURCES += $(net_C_FILES) ## netinet @@ -88,8 +88,8 @@ netinet_C_FILES = netinet/if_ether.c netinet/igmp.c netinet/in.c \ netinet/tcp_debug.c netinet/tcp_input.c netinet/tcp_output.c \ netinet/tcp_subr.c netinet/tcp_timer.c netinet/tcp_usrreq.c \ netinet/udp_usrreq.c -o_optimize_libnetworking_a_SOURCES += $(netinet_C_FILES) -o_debug_libnetworking_a_SOURCES += $(netinet_C_FILES) +libnetworking_a_SOURCES += $(netinet_C_FILES) +libnetworking_g_a_SOURCES += $(netinet_C_FILES) ## nfs @@ -99,8 +99,8 @@ include_nfs_HEADERS = nfs/krpc.h nfs/nfs.h nfs/nfsdiskless.h nfs/nfsproto.h \ nfs/rpcv2.h nfs/xdr_subs.h nfs_C_FILES = nfs/bootp_subr.c -o_optimize_libnetworking_a_SOURCES += $(nfs_C_FILES) -o_debug_libnetworking_a_SOURCES += $(nfs_C_FILES) +libnetworking_a_SOURCES += $(nfs_C_FILES) +libnetworking_g_a_SOURCES += $(nfs_C_FILES) ## rtems @@ -115,8 +115,8 @@ rtems_C_FILES = rtems/sghostname.c rtems/issetugid.c rtems/rtems_glue.c \ rtems/rtems_showipstat.c rtems/rtems_showicmpstat.c \ rtems/rtems_showtcpstat.c rtems/rtems_showudpstat.c rtems/rtems_select.c \ rtems/mkrootfs.c rtems/rtems_bsdnet_malloc_starvation.c -o_optimize_libnetworking_a_SOURCES += $(rtems_C_FILES) -o_debug_libnetworking_a_SOURCES += $(rtems_C_FILES) +libnetworking_a_SOURCES += $(rtems_C_FILES) +libnetworking_g_a_SOURCES += $(rtems_C_FILES) ## sys @@ -139,15 +139,13 @@ include_vm_HEADERS = vm/vm.h vm/vm_extern.h vm/vm_kern.h vm/vm_param.h libc_CPPFLAGS = -DNOPOLL -DNOSELECT -EXTRA_LIBRARIES += o-optimize/libc.a -o_optimize_libc_a_SOURCES = -o_optimize_libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ -$(libc_CPPFLAGS) +EXTRA_LIBRARIES += libc.a +libc_a_SOURCES = +libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(libc_CPPFLAGS) -EXTRA_LIBRARIES += o-debug/libc.a -o_debug_libc_a_SOURCES = -o_debug_libc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ -$(libc_CPPFLAGS) +EXTRA_LIBRARIES += libc_g.a +libc_g_a_SOURCES = +libc_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(libc_CPPFLAGS) libc_C_FILES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \ libc/gethostbydns.c libc/gethostbyht.c libc/gethostbynis.c \ @@ -162,15 +160,15 @@ libc_C_FILES = libc/addr2ascii.c libc/ascii2addr.c libc/base64.c \ libc/res_comp.c libc/res_data.c libc/res_debug.c libc/res_init.c \ libc/res_mkquery.c libc/res_mkupdate.c libc/res_query.c libc/res_send.c \ libc/res_stubs.c libc/res_update.c libc/strsep.c libc/rcmd.c -o_optimize_libc_a_SOURCES += $(libc_C_FILES) -o_debug_libc_a_SOURCES += $(libc_C_FILES) +libc_a_SOURCES += $(libc_C_FILES) +libc_g_a_SOURCES += $(libc_C_FILES) man_MANS = libc/addr2ascii.3 libc/byteorder.3 libc/ethers.3 \ libc/gethostbyname.3 libc/getnetent.3 libc/getprotoent.3 \ libc/getservent.3 libc/inet.3 libc/iso_addr.3 libc/linkaddr.3 libc/ns.3 \ libc/rcmd.3 libc/resolver.3 -TMP_LIBS += $(ARCH)/libc.a +TMP_LIBS += libc$(LIB_VARIANT).a EXTRA_DIST = libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ libc/base64.c libc/byteorder.3 libc/ether_addr.c libc/ethers.3 \ @@ -195,22 +193,20 @@ EXTRA_DIST = libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ lib_CPPFLAGS = -DNOPOLL -DNOSELECT -EXTRA_LIBRARIES += o-optimize/lib.a -o_optimize_lib_a_SOURCES = -o_optimize_lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ -$(lib_CPPFLAGS) +EXTRA_LIBRARIES += lib.a +lib_a_SOURCES = +lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(lib_CPPFLAGS) -EXTRA_LIBRARIES += o-debug/lib.a -o_debug_lib_a_SOURCES = -o_debug_lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ -$(lib_CPPFLAGS) +EXTRA_LIBRARIES += lib_g.a +lib_g_a_SOURCES = +lib_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(lib_CPPFLAGS) lib_C_FILES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c lib/ftpfs.c \ lib/syslog.c lib/tftpDriver.c -o_optimize_lib_a_SOURCES += $(lib_C_FILES) -o_debug_lib_a_SOURCES += $(lib_C_FILES) +lib_a_SOURCES += $(lib_C_FILES) +lib_g_a_SOURCES += $(lib_C_FILES) -TMP_LIBS += $(ARCH)/lib.a +TMP_LIBS += lib$(LIB_VARIANT).a # --- all-local: $(PREINSTALL_FILES) $(TMP_LIBS) diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog index 2801a6188b..6e2351dd8f 100644 --- a/cpukit/librpc/ChangeLog +++ b/cpukit/librpc/ChangeLog @@ -1,3 +1,8 @@ +2004-01-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Build lib*$(LIB_VARIANT).a instead of + $(ARCH)/lib*.a. + 2004-01-07 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index 150dedbdeb..f3074ac405 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -22,16 +22,16 @@ libxdr_C_FILES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \ src/xdr/xdr_sizeof.c src/xdr/xdr_stdio.c if LIBRPC -EXTRA_LIBRARIES = o-optimize/libxdr.a -o_optimize_libxdr_a_SOURCES = $(libxdr_C_FILES) -o_optimize_libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) +EXTRA_LIBRARIES = libxdr.a +libxdr_a_SOURCES = $(libxdr_C_FILES) +libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += o-debug/libxdr.a -o_debug_libxdr_a_SOURCES = $(libxdr_C_FILES) -o_debug_libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) +EXTRA_LIBRARIES += libxdr_g.a +libxdr_g_a_SOURCES = $(libxdr_C_FILES) +libxdr_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) man_MANS += src/xdr/xdr.3 -all-local: $(ARCH)/libxdr.a +all-local: libxdr$(LIB_VARIANT).a endif librpc_C_FILES = src/rpc/auth_none.c src/rpc/auth_unix.c \ @@ -54,25 +54,23 @@ librpc_UNUSED_C_FILES = src/rpc/auth_des.c src/rpc/auth_time.c \ src/rpc/svc_unix.c if LIBRPC -librpc_a_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \ +librpc_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \ -D_RTEMS_RPC_INTERNAL_ -EXTRA_LIBRARIES += o-optimize/librpc.a -o_optimize_librpc_a_SOURCES = $(librpc_C_FILES) -o_optimize_librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ -$(librpc_a_CPPFLAGS) +EXTRA_LIBRARIES += librpc.a +librpc_a_SOURCES = $(librpc_C_FILES) +librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(librpc_CPPFLAGS) -EXTRA_LIBRARIES += o-debug/librpc.a -o_debug_librpc_a_SOURCES = $(librpc_C_FILES) -o_debug_librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ -$(librpc_a_CPPFLAGS) +EXTRA_LIBRARIES += librpc_g.a +librpc_g_a_SOURCES = $(librpc_C_FILES) +librpc_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(librpc_CPPFLAGS) man_MANS += src/rpc/bindresvport.3 src/rpc/getrpcent.3 src/rpc/publickey.3 \ src/rpc/rpc.3 src/rpc/rpc_secure.3 src/rpc/rstat_svc.8 \ src/rpc/des_crypt.3 src/rpc/getrpcport.3 src/rpc/publickey.5 \ src/rpc/rpc.5 src/rpc/rstat.1 src/rpc/rtime.3 -all-local: $(ARCH)/librpc.a +all-local: librpc$(LIB_VARIANT).a endif EXTRA_DIST = $(librpc_C_FILES) src/rpc/DISCLAIMER $(librpc_UNUSED_C_FILES) |