2005-01-01 Ralf Corsepius <ralf.corsepius@rtems.org>

	* 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.

1 files changed, 15 insertions, 119 deletions

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 =