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, 4 insertions, 22 deletions

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