From 07347cb5e79d1d651655e7975b69cb8a45243017 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 7 Jan 2004 17:48:16 +0000 Subject: 2004-01-07 Ralf Corsepius * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. --- cpukit/itron/ChangeLog | 4 + cpukit/itron/Makefile.am | 20 ++- cpukit/libblock/ChangeLog | 4 + cpukit/libblock/Makefile.am | 21 ++- cpukit/libcsupport/ChangeLog | 4 + cpukit/libcsupport/Makefile.am | 43 +++--- cpukit/libfs/ChangeLog | 4 + cpukit/libfs/Makefile.am | 46 +++--- cpukit/libmisc/ChangeLog | 4 + cpukit/libmisc/Makefile.am | 306 ++++++++++++++++----------------------- cpukit/libnetworking/ChangeLog | 4 + cpukit/libnetworking/Makefile.am | 117 +++++++-------- cpukit/librpc/ChangeLog | 4 + cpukit/librpc/Makefile.am | 53 +++---- cpukit/posix/ChangeLog | 4 + cpukit/posix/Makefile.am | 21 ++- cpukit/rtems/ChangeLog | 4 + cpukit/rtems/Makefile.am | 23 +-- cpukit/sapi/ChangeLog | 4 + cpukit/sapi/Makefile.am | 22 +-- cpukit/score/ChangeLog | 4 + cpukit/score/Makefile.am | 22 +-- 22 files changed, 325 insertions(+), 413 deletions(-) diff --git a/cpukit/itron/ChangeLog b/cpukit/itron/ChangeLog index 54a352f166..5bffff3868 100644 --- a/cpukit/itron/ChangeLog +++ b/cpukit/itron/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am index b5c02cd179..891311d10d 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am EXTRA_DIST = @@ -64,8 +63,6 @@ endif ## Sources -LIB=$(ARCH)/libitron.a - TASK_C_FILES = src/task.c src/cre_tsk.c src/del_tsk.c src/sta_tsk.c \ src/ext_tsk.c src/exd_tsk.c src/ter_tsk.c src/dis_dsp.c src/ena_dsp.c \ src/chg_pri.c src/rot_rdq.c src/rel_wai.c src/get_tid.c src/ref_tsk.c @@ -103,19 +100,20 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \ $(RENDEZVOUS_C_FILES) $(INTERRUPT_C_FILES) \ $(VARIABLE_MEMORY_POOL_C_FILES) $(FIXED_MEMORY_POOL_C_FILES) \ $(TIME_C_FILES) -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -all-local: $(PREINSTALL_FILES) ${LIB} +EXTRA_LIBRARIES = o-optimize/libitron.a +o_optimize_libitron_a_SOURCES = $(C_FILES) +o_optimize_libitron_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -$(LIB): ${OBJS} - $(make-library) -endif +EXTRA_LIBRARIES += o-debug/libitron.a +o_debug_libitron_a_SOURCES = $(C_FILES) +o_debug_libitron_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +all-local: $(PREINSTALL_FILES) $(ARCH)/libitron.a +endif UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c \ src/network.c src/prcv_mbx.c src/rcv_mbx.c src/ref_mbx.c src/snd_mbx.c \ diff --git a/cpukit/libblock/ChangeLog b/cpukit/libblock/ChangeLog index a69e1afdbc..7ede66bb30 100644 --- a/cpukit/libblock/ChangeLog +++ b/cpukit/libblock/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index d362a1469f..d134a60b63 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am include_rtemsdir = $(includedir)/rtems @@ -12,23 +11,21 @@ include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \ include/rtems/diskdevs.h include/rtems/ramdisk.h \ include/rtems/ide_part_table.h -LIB = ${ARCH}/libblock.a - C_FILES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \ src/ide_part_table.c -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) +EXTRA_LIBRARIES = o-optimize/libblock.a +o_optimize_libblock_a_SOURCES = $(C_FILES) +o_optimize_libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) + +EXTRA_LIBRARIES += o-debug/libblock.a +o_debug_libblock_a_SOURCES = $(C_FILES) +o_debug_libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += $(LIBC_DEFINES) -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - -$(LIB): ${OBJS} - $(make-library) - -all-local: $(PREINSTALL_FILES) $(LIB) +all-local: $(PREINSTALL_FILES) $(ARCH)/libblock.a PREINSTALL_FILES = diff --git a/cpukit/libcsupport/ChangeLog b/cpukit/libcsupport/ChangeLog index 2f39fdeace..4709c4344a 100644 --- a/cpukit/libcsupport/ChangeLog +++ b/cpukit/libcsupport/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-16 Joel Sherrill PR 542/filesystem diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index e6aaf29586..03c5bd7ff5 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am include_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include/iosupp.h include/ringbuf.h include/rtc.h include/spurious.h \ @@ -34,12 +33,12 @@ include_rtems_HEADERS = include/rtems/assoc.h include/rtems/error.h \ ## sys include_sysdir = $(includedir)/sys - -# FIXME: We should not install to include/sys unless using newlib. -include_sys_HEADERS = include/sys/filio.h include/sys/ioccom.h \ - include/sys/ioctl.h include/sys/sockio.h include/sys/ttycom.h +include_sys_HEADERS = include/sys/ioccom.h if NEWLIB +# FIXME: We should not install to include/sys unless using newlib. +include_sys_HEADERS += include/sys/filio.h include/sys/ioctl.h \ + include/sys/sockio.h include/sys/ttycom.h include_sys_HEADERS += include/sys/termios.h include/sys/utsname.h endif @@ -55,9 +54,7 @@ include_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \ include/zilog/z8536.h ## General stuff -all-local: $(PREINSTALL_FILES) - -LIB = ${ARCH}/libcsupport.a +all-local: $(PREINSTALL_FILES) $(ARCH)/libcsupport.a AM_CPPFLAGS += -I$(top_builddir) @@ -122,21 +119,15 @@ else C_FILES = $(COMMON_C_FILES) $(EMBEDDED_C_FILES) endif -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) - -# -# Add local stuff here using += -# - AM_CFLAGS += $(LIBC_DEFINES) -all-local: ${LIB} - -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +EXTRA_LIBRARIES = o-optimize/libcsupport.a +o_optimize_libcsupport_a_SOURCES = $(C_FILES) +o_optimize_libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -$(LIB): ${OBJS} - $(make-library) +EXTRA_LIBRARIES += o-debug/libcsupport.a +o_debug_libcsupport_a_SOURCES = $(C_FILES) +o_debug_libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) DOC_FILES = src/TODO src/CASES @@ -245,14 +236,15 @@ $(PROJECT_INCLUDE)/sys/$(dirstamp): @$(mkdir_p) $(PROJECT_INCLUDE)/sys @: > $(PROJECT_INCLUDE)/sys/$(dirstamp) -$(PROJECT_INCLUDE)/sys/filio.h: include/sys/filio.h $(PROJECT_INCLUDE)/sys/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/filio.h -PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/filio.h - $(PROJECT_INCLUDE)/sys/ioccom.h: include/sys/ioccom.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioccom.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioccom.h +if NEWLIB +$(PROJECT_INCLUDE)/sys/filio.h: include/sys/filio.h $(PROJECT_INCLUDE)/sys/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/filio.h +PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/filio.h + $(PROJECT_INCLUDE)/sys/ioctl.h: include/sys/ioctl.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ioctl.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ioctl.h @@ -265,7 +257,6 @@ $(PROJECT_INCLUDE)/sys/ttycom.h: include/sys/ttycom.h $(PROJECT_INCLUDE)/sys/$(d $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/ttycom.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/ttycom.h -if NEWLIB $(PROJECT_INCLUDE)/sys/termios.h: include/sys/termios.h $(PROJECT_INCLUDE)/sys/$(dirstamp) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/sys/termios.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/sys/termios.h diff --git a/cpukit/libfs/ChangeLog b/cpukit/libfs/ChangeLog index e52930a77a..f7ce69d887 100644 --- a/cpukit/libfs/ChangeLog +++ b/cpukit/libfs/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index dbe72ef4e8..962e5d4fb9 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += $(LIBC_DEFINES) @@ -14,7 +13,6 @@ EXTRA_DIST = README include_HEADERS = # imfs - libimfs_EMBEDDED_C_FILES = src/imfs/imfs_chown.c src/imfs/imfs_config.c \ src/imfs/imfs_creat.c src/imfs/imfs_directory.c src/imfs/imfs_eval.c \ src/imfs/imfs_free.c src/imfs/imfs_fsunmount.c src/imfs/imfs_gtkn.c \ @@ -38,21 +36,18 @@ libimfs_C_FILES = $(libimfs_UNIX_C_FILES) else libimfs_C_FILES = $(libimfs_EMBEDDED_C_FILES) endif -libimfs_OBJS = $(libimfs_C_FILES:src/imfs/%.c=src/imfs/$(ARCH)/%.$(OBJEXT)) -include_HEADERS += src/imfs/imfs.h +EXTRA_LIBRARIES = o-optimize/libimfs.a +o_optimize_libimfs_a_SOURCES = $(libimfs_C_FILES) +o_optimize_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -IMFSLIB = src/imfs/$(ARCH)/libimfs.a +EXTRA_LIBRARIES += o-debug/libimfs.a +o_debug_libimfs_a_SOURCES = $(libimfs_C_FILES) +o_debug_libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -src/imfs/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/imfs/$(ARCH) - @: > src/imfs/$(ARCH)/$(dirstamp) -src/imfs/$(ARCH)/%.$(OBJEXT): src/imfs/%.c src/imfs/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -src/imfs/$(ARCH)/libimfs.a: ${libimfs_OBJS} - $(make-library) +include_HEADERS += src/imfs/imfs.h -EXTRA_DIST += $(libimfs_EMBEDDED_C_FILES) $(libimfs_UNIX_C_FILES) +IMFSLIB = $(ARCH)/libimfs.a # dosfs @@ -71,27 +66,22 @@ libdosfs_DOSFS_C_FILES = src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \ if !UNIX libdosfs_C_FILES = $(libdosfs_FATFS_C_FILES) $(libdosfs_DOSFS_C_FILES) -libdosfs_OBJS = \ - $(libdosfs_C_FILES:src/dosfs/%.c=src/dosfs/${ARCH}/%.$(OBJEXT)) include_HEADERS += src/dosfs/dosfs.h -DOSFSLIB = src/dosfs/$(ARCH)/libdosfs.a +DOSFSLIB = $(ARCH)/libdosfs.a -src/dosfs/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/dosfs/$(ARCH) - @: > src/dosfs/$(ARCH)/$(dirstamp) -src/dosfs/$(ARCH)/%.$(OBJEXT): src/dosfs/%.c src/dosfs/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -src/dosfs/$(ARCH)/libdosfs.a: ${libdosfs_OBJS} - $(make-library) -endif +EXTRA_LIBRARIES += o-optimize/libdosfs.a +o_optimize_libdosfs_a_SOURCES = $(libdosfs_C_FILES) +o_optimize_libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -all-local: $(IMFSLIB) $(DOSFSLIB) +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_DIST += $(libdosfs_DOSFS_C_FILES) $(libdosfs_FATFS_C_FILES) +endif -CLEANDIRS = src +all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB) # --- diff --git a/cpukit/libmisc/ChangeLog b/cpukit/libmisc/ChangeLog index b43583f9d4..9420aa5a0d 100644 --- a/cpukit/libmisc/ChangeLog +++ b/cpukit/libmisc/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index 3fedbebfb7..fb5df727aa 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -2,8 +2,7 @@ ## $Id$ ## -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am EXTRA_DIST = README @@ -12,298 +11,243 @@ AM_CPPFLAGS += -I$(top_builddir) include_rtemsdir = $(includedir)/rtems include_HEADERS = include_rtems_HEADERS = -noinst_HEADERS = +EXTRA_LIBRARIES = +TMP_LIBS = ## capture libcapture_C_FILES = capture/capture.c capture/capture-cli.c -libcapture_OBJS = \ - $(libcapture_C_FILES:capture/%.c=capture/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += capture/capture.h capture/capture-cli.h -capture/$(ARCH)/$(dirstamp): - @$(mkdir_p) capture/$(ARCH) - @: > capture/$(ARCH)/$(dirstamp) -capture/$(ARCH)/%.$(OBJEXT): capture/%.c capture/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -capture/$(ARCH)/libcapture.a: $(libcapture_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/libcapture.a +o_optimize_libcapture_a_SOURCES = $(libcapture_C_FILES) +o_optimize_libcapture_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFLAGS_OPTIMIZE_V) -LIBS += capture/$(ARCH)/libcapture.a +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_DIST += capture/README capture/capture.c capture/capture-cli.c +TMP_LIBS += $(ARCH)/libcapture.a ## cpuuse libcpuuse_C_FILES = cpuuse/cpuuse.c -libcpuuse_OBJS = $(libcpuuse_C_FILES:cpuuse/%.c=cpuuse/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += cpuuse/cpuuse.h -cpuuse/$(ARCH)/$(dirstamp): - @$(mkdir_p) cpuuse/$(ARCH) - @: > cpuuse/$(ARCH)/$(dirstamp) -cpuuse/$(ARCH)/%.$(OBJEXT): cpuuse/%.c cpuuse/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -cpuuse/$(ARCH)/libcpuuse.a: $(libcpuuse_OBJS) - $(make-library) +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 += o-debug/libcpuuse.a +o_debug_libcpuuse_a_SOURCES = $(libcpuuse_C_FILES) +o_debug_libcpuuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -LIBS += cpuuse/$(ARCH)/libcpuuse.a -EXTRA_DIST += cpuuse/README cpuuse/cpuuse.c +TMP_LIBS += $(ARCH)/libcpuuse.a ## devnull libdevnull_C_FILES = devnull/devnull.c -libdevnull_OBJS = \ - $(libdevnull_C_FILES:devnull/%.c=devnull/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += devnull/devnull.h -devnull/$(ARCH)/$(dirstamp): - @$(mkdir_p) devnull/$(ARCH) - @: > devnull/$(ARCH)/$(dirstamp) -devnull/$(ARCH)/%.$(OBJEXT): devnull/%.c devnull/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -devnull/$(ARCH)/libdevnull.a: $(libdevnull_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/libdevnull.a +o_optimize_libdevnull_a_SOURCES = $(libdevnull_C_FILES) +o_optimize_libdevnull_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFLAGS_OPTIMIZE_V) -LIBS += devnull/$(ARCH)/libdevnull.a +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_DIST += devnull/devnull.c +TMP_LIBS += $(ARCH)/libdevnull.a ## dummy libdummy_C_FILES = dummy/dummy.c -libdummy_OBJS = $(libdummy_C_FILES:dummy/%.c=dummy/$(ARCH)/%.$(OBJEXT)) +EXTRA_DIST += dummy/README -dummy/$(ARCH)/$(dirstamp): - @$(mkdir_p) dummy/$(ARCH) - @: > dummy/$(ARCH)/$(dirstamp) -dummy/$(ARCH)/%.$(OBJEXT): dummy/%.c dummy/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -dummy/$(ARCH)/libdummy.a: $(libdummy_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/libdummy.a +o_optimize_libdummy_a_SOURCES = $(libdummy_C_FILES) +o_optimize_libdummy_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -LIBS += dummy/$(ARCH)/libdummy.a +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_DIST += dummy/README dummy/dummy.c +TMP_LIBS += $(ARCH)/libdummy.a ## dumpbuf libdumpbuf_C_FILES = dumpbuf/dumpbuf.c -libdumpbuf_OBJS = \ - $(libdumpbuf_C_FILES:dumpbuf/%.c=dumpbuf/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += dumpbuf/dumpbuf.h -dumpbuf/$(ARCH)/$(dirstamp): - @$(mkdir_p) dumpbuf/$(ARCH) - @: > dumpbuf/$(ARCH)/$(dirstamp) -dumpbuf/$(ARCH)/%.$(OBJEXT): dumpbuf/%.c dumpbuf/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -dumpbuf/$(ARCH)/libdumpbuf.a: $(libdumpbuf_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/libdumpbuf.a +o_optimize_libdumpbuf_a_SOURCES = $(libdumpbuf_C_FILES) +o_optimize_libdumpbuf_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFLAGS_OPTIMIZE_V) -LIBS += dumpbuf/$(ARCH)/libdumpbuf.a +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_DIST += dumpbuf/dumpbuf.c +TMP_LIBS += $(ARCH)/libdumpbuf.a ## monitor -# We only build multiprocessing related files if HAS_MP was defined -libmonitor_MP_C_FILES = monitor/mon-mpci.c +include_rtems_HEADERS += monitor/monitor.h libmonitor_C_FILES = monitor/mon-command.c monitor/mon-symbols.c \ monitor/mon-prmisc.c monitor/mon-monitor.c monitor/mon-object.c \ monitor/mon-server.c monitor/mon-task.c monitor/mon-queue.c \ monitor/mon-driver.c monitor/mon-dname.c monitor/mon-itask.c \ - monitor/mon-extension.c monitor/mon-manager.c monitor/mon-config.c - -libmonitor_OBJS = \ - $(libmonitor_C_FILES:monitor/%.c=monitor/$(ARCH)/%.$(OBJEXT)) + monitor/mon-extension.c monitor/mon-manager.c monitor/mon-config.c \ + monitor/symbols.h if HAS_MP -libmonitor_OBJS += \ - $(libmonitor_MP_C_FILES:monitor/%.c=monitor/$(ARCH)/%.$(OBJEXT)) +libmonitor_C_FILES += monitor/mon-mpci.c endif -include_rtems_HEADERS += monitor/monitor.h - -noinst_HEADERS += monitor/symbols.h +EXTRA_LIBRARIES += o-optimize/libmonitor.a +o_optimize_libmonitor_a_SOURCES = $(libmonitor_C_FILES) +o_optimize_libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFLAGS_OPTIMIZE_V) -monitor/$(ARCH)/$(dirstamp): - @$(mkdir_p) monitor/$(ARCH) - @: > monitor/$(ARCH)/$(dirstamp) -monitor/$(ARCH)/%.$(OBJEXT): monitor/%.c monitor/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -monitor/$(ARCH)/libmonitor.a: $(libmonitor_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-debug/libmonitor.a +o_debug_libmonitor_a_SOURCES = $(libmonitor_C_FILES) +o_debug_libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -LIBS += monitor/$(ARCH)/libmonitor.a +EXTRA_DIST += monitor/README -EXTRA_DIST += monitor/README monitor/mon-command.c monitor/mon-config.c \ - monitor/mon-dname.c monitor/mon-driver.c monitor/mon-extension.c \ - monitor/mon-itask.c monitor/mon-manager.c monitor/mon-monitor.c \ - monitor/mon-mpci.c monitor/mon-object.c monitor/mon-prmisc.c \ - monitor/mon-queue.c monitor/mon-server.c monitor/mon-symbols.c \ - monitor/mon-task.c +TMP_LIBS += $(ARCH)/libmonitor.a ## mw-fb libmw_fb_C_FILES = mw-fb/mw_fb.c mw-fb/mw_uid.c -libmw_fb_OBJS = $(libmw_fb_C_FILES:mw-fb/%.c=mw-fb/${ARCH}/%.$(OBJEXT)) - include_rtems_HEADERS += mw-fb/mw_fb.h mw-fb/mw_uid.h -mw-fb/$(ARCH)/$(dirstamp): - @$(mkdir_p) mw-fb/$(ARCH) - @: > mw-fb/$(ARCH)/$(dirstamp) -mw-fb/$(ARCH)/%.$(OBJEXT): mw-fb/%.c mw-fb/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -mw-fb/$(ARCH)/libmw-fb.a: $(libmw_fb_OBJS) - $(make-library) +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) -LIBS += mw-fb/$(ARCH)/libmw-fb.a +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_DIST += $(libmw_fb_C_FILES) +TMP_LIBS += $(ARCH)/libmw-fb.a ## shell -libshell_C_FILES = shell/cmds.c shell/shell.c -libshell_OBJS = $(libshell_C_FILES:shell/%.c=shell/$(ARCH)/%.$(OBJEXT)) - if LIBSHELL include_rtems_HEADERS += shell/shell.h -endif +libshell_C_FILES = shell/cmds.c shell/shell.c -shell/$(ARCH)/$(dirstamp): - @$(mkdir_p) shell/$(ARCH) - @: > shell/$(ARCH)/$(dirstamp) -shell/$(ARCH)/%.$(OBJEXT): shell/%.c shell/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -shell/$(ARCH)/libshell.a: $(libshell_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/libshell.a +o_optimize_libshell_a_SOURCES = $(libshell_C_FILES) +o_optimize_libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -if LIBSHELL -LIBS += shell/$(ARCH)/libshell.a +EXTRA_LIBRARIES += o-debug/libshell.a +o_debug_libshell_a_SOURCES = $(libshell_C_FILES) +o_debug_libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) + +TMP_LIBS += $(ARCH)/libshell.a endif -EXTRA_DIST += shell/README shell/shell.c shell/cmds.c +EXTRA_DIST += shell/README ## rtmonuse librtmonuse_C_FILES = rtmonuse/rtmonuse.c -librtmonuse_OBJS = \ - $(librtmonuse_C_FILES:rtmonuse/%.c=rtmonuse/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += rtmonuse/rtmonuse.h -rtmonuse/$(ARCH)/$(dirstamp): - @$(mkdir_p) rtmonuse/$(ARCH) - @: > rtmonuse/$(ARCH)/$(dirstamp) -rtmonuse/$(ARCH)/%.$(OBJEXT): rtmonuse/%.c rtmonuse/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -rtmonuse/$(ARCH)/librtmonuse.a: $(librtmonuse_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/librtmonuse.a +o_optimize_librtmonuse_a_SOURCES = $(librtmonuse_C_FILES) +o_optimize_librtmonuse_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFLAGS_OPTIMIZE_V) -LIBS += rtmonuse/$(ARCH)/librtmonuse.a +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_DIST += rtmonuse/rtmonuse.c +TMP_LIBS += $(ARCH)/librtmonuse.a ## serdbg -libserdbg_C_FILES = serdbg/serdbg.c serdbg/serdbgio.c \ - serdbg/termios_printk.c -libserdbg_OBJS = $(libserdbg_C_FILES:serdbg/%.c=serdbg/$(ARCH)/%.$(OBJEXT)) - if LIBSERDBG include_HEADERS += serdbg/serdbgcnf.h serdbg/serdbg.h \ serdbg/termios_printk_cnf.h serdbg/termios_printk.h -endif -serdbg/$(ARCH)/$(dirstamp): - @$(mkdir_p) serdbg/$(ARCH) - @: > serdbg/$(ARCH)/$(dirstamp) -serdbg/$(ARCH)/%.$(OBJEXT): serdbg/%.c serdbg/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -serdbg/$(ARCH)/libserdbg.a: $(libserdbg_OBJS) - $(make-library) +libserdbg_C_FILES = serdbg/serdbg.c serdbg/serdbgio.c \ + serdbg/termios_printk.c -if LIBSERDBG -LIBS += serdbg/$(ARCH)/libserdbg.a +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 += o-debug/libserdbg.a +o_debug_libserdbg_a_SOURCES = $(libserdbg_C_FILES) +o_debug_libserdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) + +TMP_LIBS += $(ARCH)/libserdbg.a endif -EXTRA_DIST += serdbg/README serdbg/serdbg.c serdbg/serdbgio.c \ - serdbg/serdbgcnf.h serdbg/serdbg.h serdbg/termios_printk.c \ - serdbg/termios_printk.h serdbg/termios_printk_cnf.h +EXTRA_DIST += serdbg/README ## stackchk -libstackchk_C_FILES = stackchk/check.c -libstackchk_OBJS = \ - $(libstackchk_C_FILES:stackchk/%.c=stackchk/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += stackchk/stackchk.h +libstackchk_C_FILES = stackchk/check.c stackchk/internal.h -noinst_HEADERS += 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) -stackchk/$(ARCH)/$(dirstamp): - @$(mkdir_p) stackchk/$(ARCH) - @: > stackchk/$(ARCH)/$(dirstamp) -stackchk/$(ARCH)/%.$(OBJEXT): stackchk/%.c stackchk/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -stackchk/$(ARCH)/libstackchk.a: $(libstackchk_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-debug/libstackchk.a +o_debug_libstackchk_a_SOURCES = $(libstackchk_C_FILES) +o_debug_libstackchk_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -LIBS += stackchk/$(ARCH)/libstackchk.a - -EXTRA_DIST += stackchk/README stackchk/check.c +TMP_LIBS += $(ARCH)/libstackchk.a +EXTRA_DIST += stackchk/README ## libuntar +include_rtems_HEADERS += untar/untar.h libuntar_C_FILES = untar/untar.c -libuntar_OBJS = $(libuntar_C_FILES:untar/%.c=untar/$(ARCH)/%.$(OBJEXT)) -include_rtems_HEADERS += untar/untar.h +EXTRA_LIBRARIES += o-optimize/libuntar.a +o_optimize_libuntar_a_SOURCES = $(libuntar_C_FILES) +o_optimize_libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -untar/$(ARCH)/$(dirstamp): - @$(mkdir_p) untar/$(ARCH) - @: > untar/$(ARCH)/$(dirstamp) -untar/$(ARCH)/%.$(OBJEXT): untar/%.c untar/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -untar/$(ARCH)/libuntar.a: $(libuntar_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-debug/libuntar.a +o_debug_libuntar_a_SOURCES = $(libuntar_C_FILES) +o_debug_libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -LIBS += untar/$(ARCH)/libuntar.a +TMP_LIBS += $(ARCH)/libuntar.a -EXTRA_DIST += untar/README untar/untar.c +EXTRA_DIST += untar/README ## fsmount libfsmount_C_FILES = fsmount/fsmount.c -libfsmount_OBJS = \ - $(libfsmount_C_FILES:fsmount/%.c=fsmount/$(ARCH)/%.$(OBJEXT)) - include_rtems_HEADERS += fsmount/fsmount.h -fsmount/$(ARCH)/$(dirstamp): - @$(mkdir_p) fsmount/$(ARCH) - @: > fsmount/$(ARCH)/$(dirstamp) -fsmount/$(ARCH)/%.$(OBJEXT): fsmount/%.c fsmount/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -fsmount/$(ARCH)/libfsmount.a: $(libfsmount_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/libfsmount.a +o_optimize_libfsmount_a_SOURCES = $(libfsmount_C_FILES) +o_optimize_libfsmount_a_CPPFLAGS = $(AM_CPPFLAGS) \ + $(CFLAGS_OPTIMIZE_V) -LIBS += fsmount/$(ARCH)/libfsmount.a +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_DIST += fsmount/README fsmount/fsmount.c +TMP_LIBS += $(ARCH)/libfsmount.a -## --- +EXTRA_DIST += fsmount/README -all-local: $(LIBS) -.PRECIOUS: $(LIBS) +## --- -CLEANDIRS = */$(ARCH) +all-local: $(PREINSTALL_FILES) $(TMP_LIBS) PREINSTALL_FILES = diff --git a/cpukit/libnetworking/ChangeLog b/cpukit/libnetworking/ChangeLog index e09edaf9aa..96002e34e8 100644 --- a/cpukit/libnetworking/ChangeLog +++ b/cpukit/libnetworking/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/libnetworking/Makefile.am b/cpukit/libnetworking/Makefile.am index af575a1cef..9e14f5d6bd 100644 --- a/cpukit/libnetworking/Makefile.am +++ b/cpukit/libnetworking/Makefile.am @@ -5,16 +5,26 @@ ACLOCAL_AMFLAGS = -I ../aclocal include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am AM_CPPFLAGS += -I$(top_builddir) if HAS_NETWORKING + # Add -DFORWARD_PROTOCOL to enable UDP forwarding -- requires missing net/pf.h 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 += o-debug/libnetworking.a +o_debug_libnetworking_a_SOURCES = +o_debug_libnetworking_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ +$(libnetworking_CPPFLAGS) + TMP_LIBS = $(ARCH)/libnetworking.a ## poll.h is not in the list because RTEMS does not have poll() @@ -34,12 +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 -libnetworking_OBJS = $(kern_C_FILES:kern/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): kern/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST = $(kern_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(kern_C_FILES) +o_debug_libnetworking_a_SOURCES += $(kern_C_FILES) ## machine @@ -60,12 +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 -libnetworking_OBJS += $(net_C_FILES:net/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): net/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(net_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(net_C_FILES) +o_debug_libnetworking_a_SOURCES += $(net_C_FILES) ## netinet @@ -86,12 +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 -libnetworking_OBJS += $(netinet_C_FILES:netinet/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): netinet/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(netinet_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(netinet_C_FILES) +o_debug_libnetworking_a_SOURCES += $(netinet_C_FILES) ## nfs @@ -101,12 +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 -libnetworking_OBJS += $(nfs_C_FILES:nfs/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): nfs/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(nfs_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(nfs_C_FILES) +o_debug_libnetworking_a_SOURCES += $(nfs_C_FILES) ## rtems @@ -121,12 +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 -libnetworking_OBJS += $(rtems_C_FILES:rtems/%.c=$(ARCH)/%.$(OBJEXT)) - -$(ARCH)/%.$(OBJEXT): rtems/%.c $(ARCH)/$(dirstamp) - ${COMPILE} $(libnetworking_CPPFLAGS) -o $@ -c $< - -EXTRA_DIST += $(rtems_C_FILES) +o_optimize_libnetworking_a_SOURCES += $(rtems_C_FILES) +o_debug_libnetworking_a_SOURCES += $(rtems_C_FILES) ## sys @@ -147,6 +137,18 @@ include_vm_HEADERS = vm/vm.h vm/vm_extern.h vm/vm_kern.h vm/vm_param.h ## libc +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 += o-debug/libc.a +o_debug_libc_a_SOURCES = +o_debug_libc_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 \ libc/gethostnamadr.c libc/getnetbydns.c libc/getnetbyht.c \ @@ -160,28 +162,17 @@ 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 -libc_OBJS = $(libc_C_FILES:libc/%.c=libc/$(ARCH)/%.$(OBJEXT)) +o_optimize_libc_a_SOURCES += $(libc_C_FILES) +o_debug_libc_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 -libc_CPPFLAGS = -DNOPOLL -DNOSELECT - -libc/$(ARCH)/$(dirstamp): - @$(mkdir_p) libc/$(ARCH) - @: > libc/$(ARCH)/$(dirstamp) -libc/$(ARCH)/%.$(OBJEXT): libc/%.c libc/$(ARCH)/$(dirstamp) - ${COMPILE} $(libc_CPPFLAGS) -o $@ -c $< -libc/$(ARCH)/lib.a: $(libc_OBJS) - $(make-library) +TMP_LIBS += $(ARCH)/libc.a -TMP_LIBS += libc/$(ARCH)/lib.a - -CLEANDIRS = libc/o-optimize libc/o-debug - -EXTRA_DIST += libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ +EXTRA_DIST = libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ libc/base64.c libc/byteorder.3 libc/ether_addr.c libc/ethers.3 \ libc/gethostbydns.c libc/gethostbyht.c libc/gethostbyname.3 \ libc/gethostbynis.c libc/gethostnamadr.c libc/gethostname.c \ @@ -202,32 +193,26 @@ EXTRA_DIST += libc/addr2ascii.3 libc/addr2ascii.c libc/ascii2addr.c \ ## lib -lib_C_FILES = lib/getprotoby.c lib/rtems_bsdnet_ntp.c lib/ftpfs.c \ - lib/syslog.c lib/tftpDriver.c -lib_OBJS = $(lib_C_FILES:lib/%.c=lib/$(ARCH)/%.$(OBJEXT)) - lib_CPPFLAGS = -DNOPOLL -DNOSELECT -lib/$(ARCH)/$(dirstamp): - @$(mkdir_p) lib/$(ARCH) - @: > lib/$(ARCH)/$(dirstamp) -lib/$(ARCH)/%.$(OBJEXT): lib/%.c lib/$(ARCH)/$(dirstamp) - ${COMPILE} $(lib_CPPFLAGS) -o $@ -c $< -lib/$(ARCH)/lib.a: $(lib_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-optimize/lib.a +o_optimize_lib_a_SOURCES = +o_optimize_lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) \ +$(lib_CPPFLAGS) -TMP_LIBS += lib/$(ARCH)/lib.a +EXTRA_LIBRARIES += o-debug/lib.a +o_debug_lib_a_SOURCES = +o_debug_lib_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) \ +$(lib_CPPFLAGS) -CLEANDIRS += lib/o-optimize lib/o-debug - -EXTRA_DIST += lib/README lib/getprotoby.c lib/rtems_bsdnet_ntp.c \ +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) -# --- - -$(ARCH)/libnetworking.a: $(libnetworking_OBJS) - $(make-library) +TMP_LIBS += $(ARCH)/lib.a +# --- all-local: $(PREINSTALL_FILES) $(TMP_LIBS) endif diff --git a/cpukit/librpc/ChangeLog b/cpukit/librpc/ChangeLog index faedd2d751..2801a6188b 100644 --- a/cpukit/librpc/ChangeLog +++ b/cpukit/librpc/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index c82382e05f..150dedbdeb 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am if LIBRPC include_rpcdir = $(includedir)/rpc @@ -22,26 +21,17 @@ libxdr_C_FILES = src/xdr/xdr.c src/xdr/xdr_array.c src/xdr/xdr_float.c \ src/xdr/xdr_mem.c src/xdr/xdr_rec.c src/xdr/xdr_reference.c \ src/xdr/xdr_sizeof.c src/xdr/xdr_stdio.c -CLEANDIRS = src/xdr - -EXTRA_DIST = $(libxdr_C_FILES) - if LIBRPC -libxdr_C_O_FILES = \ - $(libxdr_C_FILES:src/xdr/%.c=src/xdr/$(ARCH)/%.$(OBJEXT)) +EXTRA_LIBRARIES = o-optimize/libxdr.a +o_optimize_libxdr_a_SOURCES = $(libxdr_C_FILES) +o_optimize_libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -libxdr_OBJS = $(libxdr_C_O_FILES) - -src/xdr/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/xdr/$(ARCH) - @: > src/xdr/$(ARCH)/$(dirstamp) -src/xdr/$(ARCH)/%.$(OBJEXT): src/xdr/%.c src/xdr/$(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< -src/xdr/$(ARCH)/libxdr.a: $(libxdr_OBJS) - $(make-library) +EXTRA_LIBRARIES += o-debug/libxdr.a +o_debug_libxdr_a_SOURCES = $(libxdr_C_FILES) +o_debug_libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) man_MANS += src/xdr/xdr.3 -all-local: src/xdr/$(ARCH)/libxdr.a +all-local: $(ARCH)/libxdr.a endif librpc_C_FILES = src/rpc/auth_none.c src/rpc/auth_unix.c \ @@ -64,33 +54,28 @@ librpc_UNUSED_C_FILES = src/rpc/auth_des.c src/rpc/auth_time.c \ src/rpc/svc_unix.c if LIBRPC -librpc_C_O_FILES = \ - $(librpc_C_FILES:src/rpc/%.c=src/rpc/$(ARCH)/%.$(OBJEXT)) - -librpc_OBJS = $(librpc_C_O_FILES) - librpc_a_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \ -D_RTEMS_RPC_INTERNAL_ -src/rpc/$(ARCH)/$(dirstamp): - @$(mkdir_p) src/rpc/$(ARCH) - @: > src/rpc/$(ARCH)/$(dirstamp) -src/rpc/$(ARCH)/%.$(OBJEXT): src/rpc/%.c src/rpc/$(ARCH)/$(dirstamp) - ${COMPILE} $(librpc_a_CPPFLAGS) -o $@ -c $< -src/rpc/$(ARCH)/librpc.a: $(librpc_OBJS) - $(make-library) +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 += 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) 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: src/rpc/$(ARCH)/librpc.a +all-local: $(ARCH)/librpc.a endif -CLEANDIRS += src/rpc - -EXTRA_DIST += $(librpc_C_FILES) src/rpc/DISCLAIMER $(librpc_UNUSED_C_FILES) +EXTRA_DIST = $(librpc_C_FILES) src/rpc/DISCLAIMER $(librpc_UNUSED_C_FILES) EXTRA_DIST += src/rpc/PSD.doc/nfs.rfc.ms src/rpc/PSD.doc/rpc.prog.ms \ src/rpc/PSD.doc/rpc.rfc.ms src/rpc/PSD.doc/rpcgen.ms \ diff --git a/cpukit/posix/ChangeLog b/cpukit/posix/ChangeLog index 9d88a9090d..6f702ef97a 100644 --- a/cpukit/posix/ChangeLog +++ b/cpukit/posix/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 1c36991cb2..6d2106293e 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am EXTRA_DIST = @@ -147,24 +146,22 @@ C_FILES = src/adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \ $(MUTEX_C_FILES) $(PTHREAD_C_FILES) $(PSIGNAL_C_FILES) src/sched.c \ $(SEMAPHORE_C_FILES) src/sysconf.c $(TIME_C_FILES) $(TIMER_C_FILES) \ src/types.c $(ENOSYS_C_FILES) $(BUILD_FOR_NOW_C_FILES) -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) - -# -# Add local stuff here using += -# AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ +EXTRA_LIBRARIES = o-optimize/libposix.a +o_optimize_libposix_a_SOURCES = $(C_FILES) +o_optimize_libposix_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) + +EXTRA_LIBRARIES += o-debug/libposix.a +o_debug_libposix_a_SOURCES = $(C_FILES) +o_debug_libposix_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) + all-local: $(PREINSTALL_FILES) $(LIB) -$(LIB): ${OBJS} - $(make-library) endif -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< - # temporary so we can see how many things are left to implement not: grep -i NOT_IMPL $(C_FILES:%=$(srcdir)/%) | grep -v MP_NOT_IMPL diff --git a/cpukit/rtems/ChangeLog b/cpukit/rtems/ChangeLog index c8cdba3450..88dab9d97d 100644 --- a/cpukit/rtems/ChangeLog +++ b/cpukit/rtems/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 12d004040b..fcbd8c338b 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am # include @@ -58,8 +57,6 @@ include_rtems_rtems_HEADERS += macros/rtems/rtems/asr.inl \ endif ## src -LIB = $(ARCH)/librtems.a - # We only build multiprocessing related files if HAS_MP was defined MP_C_FILES = src/eventmp.c src/mp.c src/msgmp.c src/partmp.c src/regionmp.c \ src/semmp.c src/signalmp.c src/taskmp.c @@ -122,22 +119,18 @@ else C_FILES = $(STD_C_FILES) endif -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) - -# -# Add local stuff here using += -# - AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -all-local: $(PREINSTALL_FILES) $(LIB) +EXTRA_LIBRARIES = o-optimize/librtems.a +o_optimize_librtems_a_SOURCES = $(C_FILES) +o_optimize_librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -${ARCH}/%.o: src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +EXTRA_LIBRARIES += o-debug/librtems.a +o_debug_librtems_a_SOURCES = $(C_FILES) +o_debug_librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -$(LIB): ${OBJS} - $(make-library) +all-local: $(PREINSTALL_FILES) $(ARCH)/librtems.a EXTRA_DIST = $(STD_C_FILES) $(MP_C_FILES) diff --git a/cpukit/sapi/ChangeLog b/cpukit/sapi/ChangeLog index 13c306bf69..f8aa87a2c8 100644 --- a/cpukit/sapi/ChangeLog +++ b/cpukit/sapi/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-12 Ralf Corsepius * Makefile.am: Use mkdir_p. Remove dirs from PRE/TMPINSTALL_FILES. diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index 9c48e7391e..05bae4c4ca 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am include_HEADERS = include/confdefs.h @@ -24,28 +23,23 @@ endif ## src -LIB=$(ARCH)/libsapi.a - EXTENSION_FILES = src/extension.c src/extensioncreate.c \ src/extensiondelete.c src/extensionident.c C_FILES = src/debug.c $(EXTENSION_FILES) src/fatal.c src/exinit.c src/io.c \ src/itronapi.c src/posixapi.c src/rtemsapi.c -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) - -# -# Add local stuff here using += -# AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -all-local: $(PREINSTALL_FILES) $(LIB) +EXTRA_LIBRARIES = o-optimize/libsapi.a +o_optimize_libsapi_a_SOURCES = $(C_FILES) +o_optimize_libsapi_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -$(LIB): ${OBJS} - $(make-library) +EXTRA_LIBRARIES += o-debug/libsapi.a +o_debug_libsapi_a_SOURCES = $(C_FILES) +o_debug_libsapi_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +all-local: $(PREINSTALL_FILES) $(ARCH)/libsapi.a EXTRA_DIST += $(C_FILES) diff --git a/cpukit/score/ChangeLog b/cpukit/score/ChangeLog index 80e98014ba..e89019c76f 100644 --- a/cpukit/score/ChangeLog +++ b/cpukit/score/ChangeLog @@ -1,3 +1,7 @@ +2004-01-07 Ralf Corsepius + + * Makefile.am: Build library using EXTRA_LIBRARIES and automake rules. + 2003-12-16 Ralf Corsepius PR 533/bsps diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index d09c020ce5..32e7d7c743 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -3,8 +3,7 @@ ## include $(top_srcdir)/automake/multilib.am -include $(top_srcdir)/automake/compile.am -include $(top_srcdir)/automake/lib.am +include $(top_srcdir)/automake/amcompile.am SUBDIRS = . cpu @@ -81,8 +80,6 @@ EXTRA_DIST = macros/README ## src -LIB=$(ARCH)/libscore.a - # We only build multiprocessing related files if HAS_MP was defined MP_C_FILES = src/mpci.c src/objectmp.c src/threadmp.c @@ -146,23 +143,20 @@ C_FILES = $(STD_C_FILES) if HAS_MP C_FILES += $(MP_C_FILES) endif -OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT)) - -# -# Add local stuff here using += -# AM_CPPFLAGS += -D__RTEMS_INSIDE__ -$(LIB): ${OBJS} - $(make-library) +EXTRA_LIBRARIES = o-optimize/libscore.a +o_optimize_libscore_a_SOURCES = $(C_FILES) +o_optimize_libscore_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -${ARCH}/%.$(OBJEXT): src/%.c $(ARCH)/$(dirstamp) - ${COMPILE} -o $@ -c $< +EXTRA_LIBRARIES += o-debug/libscore.a +o_debug_libscore_a_SOURCES = $(C_FILES) +o_debug_libscore_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt -all-local: $(PREINSTALL_FILES) $(LIB) +all-local: $(PREINSTALL_FILES) $(ARCH)/libscore.a PREINSTALL_FILES = -- cgit v1.2.3