From 846a4af8932138bf4c35f8f24ca1fc3e4ad1c86a Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sat, 1 Jan 2005 10:41:29 +0000 Subject: 2005-01-01 Ralf Corsepius * automake/compile.am, httpd/Makefile.am, itron/Makefile.am, libblock/Makefile.am, libcsupport/Makefile.am, libfs/Makefile.am, libmisc/Makefile.am, libnetworking/Makefile.am, librpc/Makefile.am, posix/Makefile.am, rtems/Makefile.am, sapi/Makefile.am, score/Makefile.am, wrapup/Makefile.am: Remove build-variant support. --- cpukit/ChangeLog | 9 +++ cpukit/automake/compile.am | 19 ------ cpukit/httpd/Makefile.am | 18 ++---- cpukit/itron/Makefile.am | 10 +-- cpukit/libblock/Makefile.am | 11 +--- cpukit/libcsupport/Makefile.am | 13 +--- cpukit/libfs/Makefile.am | 26 ++------ cpukit/libmisc/Makefile.am | 134 +++++------------------------------------ cpukit/librpc/Makefile.am | 20 +----- cpukit/posix/Makefile.am | 10 +-- cpukit/rtems/Makefile.am | 12 +--- cpukit/sapi/Makefile.am | 12 +--- cpukit/score/Makefile.am | 12 +--- cpukit/wrapup/Makefile.am | 75 +++++++++++------------ 14 files changed, 88 insertions(+), 293 deletions(-) diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 77d06f3bcc..af5785bf80 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,12 @@ +2005-01-01 Ralf Corsepius + + * automake/compile.am, httpd/Makefile.am, itron/Makefile.am, + libblock/Makefile.am, libcsupport/Makefile.am, libfs/Makefile.am, + libmisc/Makefile.am, libnetworking/Makefile.am, librpc/Makefile.am, + posix/Makefile.am, rtems/Makefile.am, sapi/Makefile.am, + score/Makefile.am, wrapup/Makefile.am: + Remove build-variant support. + 2004-12-30 Ralf Corsepius * httpd/Makefile.am: Remove -DOS="RTEMS". diff --git a/cpukit/automake/compile.am b/cpukit/automake/compile.am index c4048dd529..bb74191609 100644 --- a/cpukit/automake/compile.am +++ b/cpukit/automake/compile.am @@ -38,28 +38,9 @@ depend: ## ------------------------------------------------------------------------- -## translate VARIANT into VARIANT_V -VARIANT = OPTIMIZE - -VARIANT_OPTIMIZE_V = OPTIMIZE -VARIANT_DEBUG_V = DEBUG -VARIANT_optimize_V = OPTIMIZE -VARIANT_debug_V = DEBUG - -VARIANT_V = $(VARIANT_$(VARIANT)_V) - -## Setup the library suffix -LIBSUFFIX_OPTIMIZE_V = -LIBSUFFIX_DEBUG_V = _g -LIBSUFFIX__V = $(LIBSUFFIX_OPTIMIZE_V) - -LIB_VARIANT = $(LIBSUFFIX_$(VARIANT_V)_V) - ## These are supposed to be set in make/custom/.cfg CPU_CFLAGS = @CPU_CFLAGS@ CFLAGS_OPTIMIZE_V = @CFLAGS_OPTIMIZE_V@ -CFLAGS_DEBUG_V = @CFLAGS_DEBUG_V@ -CFLAGS__V = $(CFLAGS_OPTIMIZE_V) ## ------------------------------------------------------------------------- AM_CPPFLAGS = $(RTEMS_CPPFLAGS) diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am index 1ebf430d52..cf1762d3a1 100644 --- a/cpukit/httpd/Makefile.am +++ b/cpukit/httpd/Makefile.am @@ -4,7 +4,7 @@ include $(top_srcdir)/automake/compile.am -EXTRA_LIBRARIES = +noinst_LIBRARIES = CLEANFILES = AM_CPPFLAGS += -DWEBS -DUEMF @@ -17,20 +17,12 @@ include_HEADERS = rtems_webserver.h include_goahead_HEADERS = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h \ wsIntrn.h -EXTRA_LIBRARIES += libhttpd.a -CLEANFILES += libhttpd.a +project_lib_LIBRARIES = libhttpd.a libhttpd_a_SOURCES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c \ form.c h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c \ security.c sock.c socket.c sym.c uemf.c um.c url.c value.c wbase64.c \ webrom.c webs.c websuemf.c webmain.c libhttpd_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) - -EXTRA_LIBRARIES += libhttpd_g.a -CLEANFILES += libhttpd_g.a -libhttpd_g_a_SOURCES = $(libhttpd_a_SOURCES) -libhttpd_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -project_lib_DATA = libhttpd$(LIB_VARIANT).a endif endif @@ -95,9 +87,9 @@ $(PROJECT_INCLUDE)/goahead/wsIntrn.h: wsIntrn.h $(PROJECT_INCLUDE)/goahead/$(dir $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/wsIntrn.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/wsIntrn.h -$(PROJECT_LIB)/libhttpd$(LIB_VARIANT).a: libhttpd$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/libhttpd$(LIB_VARIANT).a -TMPINSTALL_FILES += $(PROJECT_LIB)/libhttpd$(LIB_VARIANT).a +$(PROJECT_LIB)/libhttpd.a: libhttpd.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/libhttpd.a +TMPINSTALL_FILES += $(PROJECT_LIB)/libhttpd.a endif endif diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am index cdcf7797e1..339eec0869 100644 --- a/cpukit/itron/Makefile.am +++ b/cpukit/itron/Makefile.am @@ -106,17 +106,11 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \ AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -EXTRA_LIBRARIES = libitron.a -CLEANFILES += libitron.a +noinst_LIBRARIES = libitron.a libitron_a_SOURCES = $(C_FILES) libitron_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libitron_g.a -CLEANFILES += libitron_g.a -libitron_g_a_SOURCES = $(libitron_a_SOURCES) -libitron_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -all-local: $(PREINSTALL_FILES) libitron$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) endif UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c \ diff --git a/cpukit/libblock/Makefile.am b/cpukit/libblock/Makefile.am index d79be4e589..80f6f59997 100644 --- a/cpukit/libblock/Makefile.am +++ b/cpukit/libblock/Makefile.am @@ -12,14 +12,9 @@ CLEANFILES = if !UNIX include_rtemsdir = $(includedir)/rtems -EXTRA_LIBRARIES = libblock.a -CLEANFILES += libblock.a +noinst_LIBRARIES = libblock.a libblock_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libblock_g.a -CLEANFILES += libblock_g.a -libblock_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - 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 @@ -27,9 +22,7 @@ include_rtems_HEADERS = include/rtems/bdbuf.h include/rtems/blkdev.h \ libblock_a_SOURCES = src/bdbuf.c src/blkdev.c src/diskdevs.c src/ramdisk.c \ src/ide_part_table.c -libblock_g_a_SOURCES = $(libblock_a_SOURCES) - -all-local: $(PREINSTALL_FILES) libblock$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) endif PREINSTALL_DIRS = diff --git a/cpukit/libcsupport/Makefile.am b/cpukit/libcsupport/Makefile.am index 1dedbbf4ae..cbd1e1cfbc 100644 --- a/cpukit/libcsupport/Makefile.am +++ b/cpukit/libcsupport/Makefile.am @@ -7,14 +7,9 @@ include $(top_srcdir)/automake/compile.am AM_CPPFLAGS += -I$(top_builddir) -EXTRA_LIBRARIES = libcsupport.a -CLEANFILES = libcsupport.a +noinst_LIBRARIES = libcsupport.a libcsupport_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libcsupport_g.a -CLEANFILES += libcsupport_g.a -libcsupport_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = include/chain.h include/console.h include/clockdrv.h \ include/iosupp.h include/ringbuf.h include/rtc.h include/spurious.h \ @@ -63,7 +58,7 @@ include_rtems_zilog_HEADERS = include/zilog/z8036.h include/zilog/z8530.h \ include/zilog/z8536.h ## General stuff -all-local: $(PREINSTALL_FILES) libcsupport$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) ERROR_C_FILES = src/error.c @@ -121,8 +116,6 @@ libcsupport_a_SOURCES += $(LIBC_GLUE_C_FILES) $(PASSWORD_GROUP_C_FILES) \ $(TERMIOS_C_FILES) endif -libcsupport_g_a_SOURCES = $(libcsupport_a_SOURCES) - EXTRA_DIST = src/TODO src/CASES src/README DISTCLEANFILES = @@ -315,7 +308,7 @@ $(PROJECT_INCLUDE)/rtems/zilog/z8536.h: include/zilog/z8536.h $(PROJECT_INCLUDE) $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/zilog/z8536.h PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/zilog/z8536.h -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES += $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/libfs/Makefile.am b/cpukit/libfs/Makefile.am index 11a6862ef3..4ebee6e613 100644 --- a/cpukit/libfs/Makefile.am +++ b/cpukit/libfs/Makefile.am @@ -12,14 +12,9 @@ EXTRA_DIST = README include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = -EXTRA_LIBRARIES = libimfs.a -CLEANFILES = libimfs.a +noinst_LIBRARIES = libimfs.a libimfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libimfs_g.a -CLEANFILES += libimfs_g.a -libimfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - UNUSED_FILES = src/imfs/imfs_load_tar.c libimfs_a_SOURCES = @@ -42,23 +37,14 @@ libimfs_a_SOURCES += src/imfs/imfs_chown.c src/imfs/imfs_config.c \ src/imfs/ioman.c src/imfs/miniimfs_init.c endif -libimfs_g_a_SOURCES = $(libimfs_a_SOURCES) - include_rtems_HEADERS += src/imfs/imfs.h -IMFSLIB = libimfs$(LIB_VARIANT).a - # dosfs if !UNIX -EXTRA_LIBRARIES += libdosfs.a -CLEANFILES += libdosfs.a +noinst_LIBRARIES += libdosfs.a libdosfs_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libdosfs_g.a -CLEANFILES += libdosfs_g.a -libdosfs_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - # libdosfs_FATFS_C_FILES libdosfs_a_SOURCES = src/dosfs/fat.c src/dosfs/fat.h \ src/dosfs/fat_fat_operations.c src/dosfs/fat_fat_operations.h \ @@ -73,16 +59,12 @@ libdosfs_a_SOURCES += src/dosfs/msdos_create.c src/dosfs/msdos_dir.c \ src/dosfs/msdos_mknod.c src/dosfs/msdos_node_type.c \ src/dosfs/msdos_conv.c src/dosfs/msdos.h src/dosfs/msdos_format.c -libdosfs_g_a_SOURCES = $(libdosfs_a_SOURCES) - include_rtems_HEADERS += src/dosfs/dosfs.h - -DOSFSLIB = libdosfs$(LIB_VARIANT).a endif EXTRA_DIST += $(UNUSED_FILES) -all-local: $(PREINSTALL_FILES) $(IMFSLIB) $(DOSFSLIB) +all-local: $(PREINSTALL_FILES) # --- @@ -104,7 +86,7 @@ $(PROJECT_INCLUDE)/rtems/dosfs.h: src/dosfs/dosfs.h $(PROJECT_INCLUDE)/rtems/$(d PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/dosfs.h endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/libmisc/Makefile.am b/cpukit/libmisc/Makefile.am index 1d1cd18209..a287ca6f60 100644 --- a/cpukit/libmisc/Makefile.am +++ b/cpukit/libmisc/Makefile.am @@ -10,87 +10,46 @@ AM_CPPFLAGS += -I$(top_builddir) include_rtemsdir = $(includedir)/rtems include_rtems_HEADERS = -EXTRA_LIBRARIES = -TMP_LIBS = +noinst_LIBRARIES = CLEANFILES = ## capture EXTRA_DIST += capture/README include_rtems_HEADERS += capture/capture.h capture/capture-cli.h -EXTRA_LIBRARIES += libcapture.a -CLEANFILES += libcapture.a +noinst_LIBRARIES += libcapture.a libcapture_a_SOURCES = capture/capture.c capture/capture-cli.c libcapture_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libcapture_g.a -CLEANFILES += libcapture_g.a -libcapture_g_a_SOURCES = $(libcapture_a_SOURCES) -libcapture_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libcapture$(LIB_VARIANT).a - ## cpuuse EXTRA_DIST += cpuuse/README include_rtems_HEADERS += cpuuse/cpuuse.h -EXTRA_LIBRARIES += libcpuuse.a -CLEANFILES += libcpuuse.a +noinst_LIBRARIES += libcpuuse.a libcpuuse_a_SOURCES = cpuuse/cpuuse.c libcpuuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libcpuuse_g.a -CLEANFILES += libcpuuse_g.a -libcpuuse_g_a_SOURCES = $(libcpuuse_a_SOURCES) -libcpuuse_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libcpuuse$(LIB_VARIANT).a - ## devnull include_rtems_HEADERS += devnull/devnull.h -EXTRA_LIBRARIES += libdevnull.a -CLEANFILES += libdevnull.a +noinst_LIBRARIES += libdevnull.a libdevnull_a_SOURCES = devnull/devnull.c libdevnull_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libdevnull_g.a -CLEANFILES += libdevnull_g.a -libdevnull_g_a_SOURCES = $(libdevnull_a_SOURCES) -libdevnull_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libdevnull$(LIB_VARIANT).a - ## dummy EXTRA_DIST += dummy/README -EXTRA_LIBRARIES += libdummy.a -CLEANFILES += libdummy.a +noinst_LIBRARIES += libdummy.a libdummy_a_SOURCES = dummy/dummy.c libdummy_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libdummy_g.a -CLEANFILES += libdummy_g.a -libdummy_g_a_SOURCES = $(libdummy_a_SOURCES) -libdummy_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libdummy$(LIB_VARIANT).a - ## dumpbuf include_rtems_HEADERS += dumpbuf/dumpbuf.h -EXTRA_LIBRARIES += libdumpbuf.a -CLEANFILES += libdumpbuf.a +noinst_LIBRARIES += libdumpbuf.a libdumpbuf_a_SOURCES = dumpbuf/dumpbuf.c libdumpbuf_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libdumpbuf_g.a -CLEANFILES += libdumpbuf_g.a -libdumpbuf_g_a_SOURCES = $(libdumpbuf_a_SOURCES) -libdumpbuf_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libdumpbuf$(LIB_VARIANT).a - ## monitor include_rtems_HEADERS += monitor/monitor.h @@ -104,50 +63,26 @@ if HAS_MP libmonitor_a_SOURCES += monitor/mon-mpci.c endif -EXTRA_LIBRARIES += libmonitor.a -CLEANFILES += libmonitor.a +noinst_LIBRARIES += libmonitor.a libmonitor_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libmonitor_g.a -CLEANFILES += libmonitor_g.a -libmonitor_g_a_SOURCES = $(libmonitor_a_SOURCES) -libmonitor_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - EXTRA_DIST += monitor/README -TMP_LIBS += libmonitor$(LIB_VARIANT).a - ## mw-fb include_rtems_HEADERS += mw-fb/mw_fb.h mw-fb/mw_uid.h -EXTRA_LIBRARIES += libmw-fb.a -CLEANFILES += libmw-fb.a +noinst_LIBRARIES += libmw-fb.a libmw_fb_a_SOURCES = mw-fb/mw_fb.c mw-fb/mw_uid.c libmw_fb_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libmw-fb_g.a -CLEANFILES += libmw-fb_g.a -libmw_fb_g_a_SOURCES = $(libmw_fb_a_SOURCES) -libmw_fb_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libmw-fb$(LIB_VARIANT).a - ## shell if LIBSHELL include_rtems_HEADERS += shell/shell.h -EXTRA_LIBRARIES += libshell.a -CLEANFILES += libshell.a +noinst_LIBRARIES += libshell.a libshell_a_SOURCES = shell/cmds.c shell/shell.c libshell_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) - -EXTRA_LIBRARIES += libshell_g.a -CLEANFILES += libshell_g.a -libshell_g_a_SOURCES = $(libshell_a_SOURCES) -libshell_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libshell$(LIB_VARIANT).a endif EXTRA_DIST += shell/README @@ -155,36 +90,20 @@ EXTRA_DIST += shell/README ## rtmonuse include_rtems_HEADERS += rtmonuse/rtmonuse.h -EXTRA_LIBRARIES += librtmonuse.a -CLEANFILES += librtmonuse.a +noinst_LIBRARIES += librtmonuse.a librtmonuse_a_SOURCES = rtmonuse/rtmonuse.c librtmonuse_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += librtmonuse_g.a -CLEANFILES += librtmonuse_g.a -librtmonuse_g_a_SOURCES = $(librtmonuse_a_SOURCES) -librtmonuse_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += librtmonuse$(LIB_VARIANT).a - ## serdbg if LIBSERDBG include_rtems_HEADERS += serdbg/serdbgcnf.h serdbg/serdbg.h \ serdbg/termios_printk_cnf.h serdbg/termios_printk.h -EXTRA_LIBRARIES += libserdbg.a -CLEANFILES += libserdbg.a +noinst_LIBRARIES += libserdbg.a libserdbg_a_SOURCES = serdbg/serdbg.c serdbg/serdbgio.c \ serdbg/termios_printk.c libserdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) - -EXTRA_LIBRARIES += libserdbg_g.a -CLEANFILES += libserdbg_g.a -libserdbg_g_a_SOURCES = $(libserdbg_a_SOURCES) -libserdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libserdbg$(LIB_VARIANT).a endif EXTRA_DIST += serdbg/README @@ -193,57 +112,34 @@ EXTRA_DIST += serdbg/README include_rtems_HEADERS += stackchk/stackchk.h -EXTRA_LIBRARIES += libstackchk.a -CLEANFILES += libstackchk.a +noinst_LIBRARIES += libstackchk.a libstackchk_a_SOURCES = stackchk/check.c stackchk/internal.h libstackchk_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libstackchk_g.a -CLEANFILES += libstackchk_g.a -libstackchk_g_a_SOURCES = $(libstackchk_a_SOURCES) -libstackchk_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libstackchk$(LIB_VARIANT).a EXTRA_DIST += stackchk/README ## libuntar include_rtems_HEADERS += untar/untar.h -EXTRA_LIBRARIES += libuntar.a -CLEANFILES += libuntar.a +noinst_LIBRARIES += libuntar.a libuntar_a_SOURCES = untar/untar.c libuntar_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libuntar_g.a -CLEANFILES += libuntar_g.a -libuntar_g_a_SOURCES = $(libuntar_a_SOURCES) -libuntar_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libuntar$(LIB_VARIANT).a - EXTRA_DIST += untar/README ## fsmount include_rtems_HEADERS += fsmount/fsmount.h -EXTRA_LIBRARIES += libfsmount.a -CLEANFILES += libfsmount.a +noinst_LIBRARIES += libfsmount.a libfsmount_a_SOURCES = fsmount/fsmount.c libfsmount_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libfsmount_g.a -CLEANFILES += libfsmount_g.a -libfsmount_g_a_SOURCES = $(libfsmount_a_SOURCES) -libfsmount_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -TMP_LIBS += libfsmount$(LIB_VARIANT).a - EXTRA_DIST += fsmount/README ## --- -all-local: $(PREINSTALL_FILES) $(TMP_LIBS) +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = diff --git a/cpukit/librpc/Makefile.am b/cpukit/librpc/Makefile.am index 975bfceabd..825c8ac5d1 100644 --- a/cpukit/librpc/Makefile.am +++ b/cpukit/librpc/Makefile.am @@ -19,18 +19,12 @@ include_rpc_HEADERS = include/rpc/auth.h include/rpc/auth_des.h \ man_MANS = -EXTRA_LIBRARIES = libxdr.a -CLEANFILES += libxdr.a +noinst_LIBRARIES = libxdr.a libxdr_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libxdr_g.a -CLEANFILES += libxdr_g.a -libxdr_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - libxdr_a_SOURCES = 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 -libxdr_g_a_SOURCES = $(libxdr_a_SOURCES) endif libxdr_mans = src/xdr/xdr.3 @@ -39,16 +33,9 @@ EXTRA_DIST += $(libxdr_mans) if LIBRPC man_MANS += $(libxdr_mans) -all-local: libxdr$(LIB_VARIANT).a - -EXTRA_LIBRARIES += librpc.a -CLEANFILES += librpc.a +noinst_LIBRARIES += librpc.a librpc_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) $(librpc_CPPFLAGS) -EXTRA_LIBRARIES += librpc_g.a -CLEANFILES += librpc_g.a -librpc_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) $(librpc_CPPFLAGS) - librpc_a_SOURCES = src/rpc/auth_none.c src/rpc/auth_unix.c \ src/rpc/authunix_prot.c src/rpc/bindresvport.c src/rpc/clnt_generic.c \ src/rpc/clnt_perror.c src/rpc/clnt_raw.c src/rpc/clnt_simple.c \ @@ -67,7 +54,6 @@ EXTRA_DIST += src/rpc/auth_des.c src/rpc/auth_time.c src/rpc/authdes_prot.c \ src/rpc/clnt_unix.c src/rpc/crypt_client.c src/rpc/des_crypt.c \ src/rpc/des_soft.c src/rpc/getpublickey.c src/rpc/key_call.c \ src/rpc/key_prot_xdr.c src/rpc/svc_auth_des.c src/rpc/svc_unix.c -librpc_g_a_SOURCES = $(librpc_a_SOURCES) librpc_CPPFLAGS = -D_RPC_read=read -D_RPC_write=write -D_RPC_close=close \ -D_RTEMS_RPC_INTERNAL_ @@ -81,8 +67,6 @@ EXTRA_DIST += $(librpc_mans) if LIBRPC man_MANS += $(librpc_mans) - -all-local: librpc$(LIB_VARIANT).a endif EXTRA_DIST += src/rpc/DISCLAIMER src/rpc/README diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index ab5b4824d7..c360047cec 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -150,17 +150,11 @@ C_FILES = src/adasupp.c $(CANCEL_C_FILES) $(CONDITION_VARIABLE_C_FILES) \ AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -EXTRA_LIBRARIES = libposix.a -CLEANFILES += libposix.a +noinst_LIBRARIES = libposix.a libposix_a_SOURCES = $(C_FILES) libposix_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libposix_g.a -CLEANFILES += libposix_g.a -libposix_g_a_SOURCES = $(libposix_a_SOURCES) -libposix_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -all-local: $(PREINSTALL_FILES) libposix$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) endif # temporary so we can see how many things are left to implement diff --git a/cpukit/rtems/Makefile.am b/cpukit/rtems/Makefile.am index 8f82d7ffa0..59340f392e 100644 --- a/cpukit/rtems/Makefile.am +++ b/cpukit/rtems/Makefile.am @@ -8,14 +8,9 @@ include $(top_srcdir)/automake/compile.am AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -EXTRA_LIBRARIES = librtems.a -CLEANFILES = librtems.a +noinst_LIBRARIES = librtems.a librtems_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += librtems_g.a -CLEANFILES += librtems_g.a -librtems_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - # include include_HEADERS = include/rtems.h @@ -128,9 +123,8 @@ if HAS_MP librtems_a_SOURCES += src/eventmp.c src/mp.c src/msgmp.c src/partmp.c \ src/regionmp.c src/semmp.c src/signalmp.c src/taskmp.c endif -librtems_g_a_SOURCES = $(librtems_a_SOURCES) -all-local: $(PREINSTALL_FILES) librtems$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -406,7 +400,7 @@ $(PROJECT_INCLUDE)/rtems/rtems/timer.inl: macros/rtems/rtems/timer.inl $(PROJECT PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems/timer.inl endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am index 93684bc0dd..73f914d2b8 100644 --- a/cpukit/sapi/Makefile.am +++ b/cpukit/sapi/Makefile.am @@ -30,17 +30,11 @@ C_FILES = src/debug.c $(EXTENSION_FILES) src/fatal.c src/exinit.c src/io.c \ AM_CPPFLAGS += -I$(top_builddir) AM_CPPFLAGS += -D__RTEMS_INSIDE__ -EXTRA_LIBRARIES = libsapi.a -CLEANFILES = libsapi.a +noinst_LIBRARIES = libsapi.a libsapi_a_SOURCES = $(C_FILES) libsapi_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libsapi_g.a -CLEANFILES += libsapi_g.a -libsapi_g_a_SOURCES = $(libsapi_a_SOURCES) -libsapi_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - -all-local: $(PREINSTALL_FILES) libsapi$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) PREINSTALL_DIRS = PREINSTALL_FILES = @@ -93,7 +87,7 @@ $(PROJECT_INCLUDE)/rtems/extension.inl: macros/rtems/extension.inl $(PROJECT_INC PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/extension.inl endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES = $(PREINSTALL_DIRS) include $(top_srcdir)/automake/local.am diff --git a/cpukit/score/Makefile.am b/cpukit/score/Makefile.am index 3188f22f9d..c684e01920 100644 --- a/cpukit/score/Makefile.am +++ b/cpukit/score/Makefile.am @@ -146,19 +146,13 @@ endif AM_CPPFLAGS += -D__RTEMS_INSIDE__ -EXTRA_LIBRARIES = libscore.a -CLEANFILES = libscore.a +noinst_LIBRARIES = libscore.a libscore_a_SOURCES = $(C_FILES) libscore_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V) -EXTRA_LIBRARIES += libscore_g.a -CLEANFILES += libscore_g.a -libscore_g_a_SOURCES = $(libscore_a_SOURCES) -libscore_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V) - EXTRA_DIST += $(STD_C_FILES) $(MP_C_FILES) src/Unlimited.txt -all-local: $(PREINSTALL_FILES) libscore$(LIB_VARIANT).a +all-local: $(PREINSTALL_FILES) DISTCLEANFILES = include/rtems/score/cpuopts.h @@ -484,7 +478,7 @@ PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score/threadmp.inl endif endif -CLEANFILES += $(PREINSTALL_FILES) +CLEANFILES = $(PREINSTALL_FILES) DISTCLEANFILES += $(PREINSTALL_DIRS) include $(top_srcdir)/automake/subdirs.am diff --git a/cpukit/wrapup/Makefile.am b/cpukit/wrapup/Makefile.am index 08686197bc..67d876d476 100644 --- a/cpukit/wrapup/Makefile.am +++ b/cpukit/wrapup/Makefile.am @@ -6,74 +6,69 @@ include $(top_srcdir)/automake/multilib.am include $(top_srcdir)/automake/compile.am ## Setup the variant build subdirectory -ARCH_OPTIMIZE_V = o-optimize -ARCH_DEBUG_V = o-debug +ARCH = o-optimize -ARCH__V = $(ARCH_OPTIMIZE_V) -ARCH = $(ARCH_$(VARIANT_V)_V) - -project_lib_DATA = $(ARCH)/librtemscpu$(LIB_VARIANT).a -CLEANFILES = o-optimize/librtemscpu.a -CLEANFILES += o-debug/librtemscpu_g.a +project_lib_DATA = librtemscpu.a +CLEANFILES = librtemscpu.a TMP_LIBS = if LIBSCORECPU -TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu$(LIB_VARIANT).a +TMP_LIBS += ../score/cpu/@RTEMS_CPU@/libscorecpu.a endif -TMP_LIBS += ../score/libscore$(LIB_VARIANT).a -TMP_LIBS += ../sapi/libsapi$(LIB_VARIANT).a -TMP_LIBS += ../rtems/librtems$(LIB_VARIANT).a +TMP_LIBS += ../score/libscore.a +TMP_LIBS += ../sapi/libsapi.a +TMP_LIBS += ../rtems/librtems.a if HAS_POSIX -TMP_LIBS += ../posix/libposix$(LIB_VARIANT).a +TMP_LIBS += ../posix/libposix.a endif if HAS_ITRON -TMP_LIBS += ../itron/libitron$(LIB_VARIANT).a +TMP_LIBS += ../itron/libitron.a endif -TMP_LIBS += ../libcsupport/libcsupport$(LIB_VARIANT).a +TMP_LIBS += ../libcsupport/libcsupport.a if !UNIX -TMP_LIBS += ../libblock/libblock$(LIB_VARIANT).a -TMP_LIBS += ../libfs/libdosfs$(LIB_VARIANT).a +TMP_LIBS += ../libblock/libblock.a +TMP_LIBS += ../libfs/libdosfs.a endif -TMP_LIBS += ../libfs/libimfs$(LIB_VARIANT).a +TMP_LIBS += ../libfs/libimfs.a -TMP_LIBS += ../libmisc/libmonitor$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libuntar$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libstackchk$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libcpuuse$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/librtmonuse$(LIB_VARIANT).a +TMP_LIBS += ../libmisc/libmonitor.a +TMP_LIBS += ../libmisc/libuntar.a +TMP_LIBS += ../libmisc/libstackchk.a +TMP_LIBS += ../libmisc/libcpuuse.a +TMP_LIBS += ../libmisc/librtmonuse.a ## XXX temporarily removed because it causes a ## XXX number of BSPs to not link "main(){}" used by autoconf # if LIBSERDBG -# TMP_LIBS += ../libmisc/libserdbg$(LIB_VARIANT).a +# TMP_LIBS += ../libmisc/libserdbg.a # endif if LIBSHELL -TMP_LIBS += ../libmisc/libshell$(LIB_VARIANT).a +TMP_LIBS += ../libmisc/libshell.a endif -TMP_LIBS += ../libmisc/libdumpbuf$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libdevnull$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libdummy$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libmw-fb$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libcapture$(LIB_VARIANT).a -TMP_LIBS += ../libmisc/libfsmount$(LIB_VARIANT).a +TMP_LIBS += ../libmisc/libdumpbuf.a +TMP_LIBS += ../libmisc/libdevnull.a +TMP_LIBS += ../libmisc/libdummy.a +TMP_LIBS += ../libmisc/libmw-fb.a +TMP_LIBS += ../libmisc/libcapture.a +TMP_LIBS += ../libmisc/libfsmount.a if HAS_NETWORKING -TMP_LIBS += ../libnetworking/libnetworking$(LIB_VARIANT).a -TMP_LIBS += ../libnetworking/libc$(LIB_VARIANT).a -TMP_LIBS += ../libnetworking/lib$(LIB_VARIANT).a +TMP_LIBS += ../libnetworking/libnetworking.a +TMP_LIBS += ../libnetworking/libc.a +TMP_LIBS += ../libnetworking/lib.a endif if LIBRPC -TMP_LIBS += ../librpc/librpc$(LIB_VARIANT).a -TMP_LIBS += ../librpc/libxdr$(LIB_VARIANT).a +TMP_LIBS += ../librpc/librpc.a +TMP_LIBS += ../librpc/libxdr.a endif -$(ARCH)/librtemscpu$(LIB_VARIANT).a: $(TMP_LIBS) +librtemscpu.a: $(TMP_LIBS) rm -f $@ $(mkdir_p) $(ARCH) rm -rf $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel @@ -113,9 +108,9 @@ $(PROJECT_LIB)/$(dirstamp): @: > $(PROJECT_LIB)/$(dirstamp) TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp) -$(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a: $(ARCH)/librtemscpu$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp) - $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a -TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu$(LIB_VARIANT).a +$(PROJECT_LIB)/librtemscpu.a: librtemscpu.a $(PROJECT_LIB)/$(dirstamp) + $(INSTALL_DATA) $< $(PROJECT_LIB)/librtemscpu.a +TMPINSTALL_FILES += $(PROJECT_LIB)/librtemscpu.a CLEANFILES += $(TMPINSTALL_FILES) -- cgit v1.2.3