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

	* libchip/Makefile.am, librdbg/Makefile.am, optman/Makefile.am
	support/Makefile.am, wrapup/Makefile.am:
	Remove build-variant support.

1 files changed, 28 insertions, 35 deletions

diff --git a/c/src/wrapup/Makefile.am b/c/src/wrapup/Makefile.am
index 5e2adaf76c..5ccc8e9c49 100644
--- a/c/src/wrapup/Makefile.am
+++ b/c/src/wrapup/Makefile.am
@@ -7,86 +7,79 @@
 include $(top_srcdir)/automake/compile.am
 
 ## Setup the variant build subdirectory
-ARCH_OPTIMIZE_V = o-optimize
-ARCH_DEBUG_V = o-debug
-
-ARCH__V = $(ARCH_OPTIMIZE_V)
-ARCH = $(ARCH_$(VARIANT_V)_V)
-
-project_lib_DATA = $(ARCH)/librtemsbsp$(LIB_VARIANT).a
+project_lib_DATA = o-optimize/librtemsbsp.a
 CLEANFILES = o-optimize/librtemsbsp.a
-CLEANFILES += o-debug/librtemsbsp_g.a
 
-SRCS = ../support/libsupport$(LIB_VARIANT).a
+SRCS = ../support/libsupport.a
 
 if HAS_LIBBSP
 if HAS_WRAPUP_LIBBSP
 SRCS += \
-    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/$(ARCH)/libbsp.a
+    ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/wrapup/o-optimize/libbsp.a
 else
-SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp$(LIB_VARIANT).a
+SRCS += ../lib/libbsp/@RTEMS_CPU@/@RTEMS_BSP_FAMILY@/libbsp.a
 endif
 endif
 
 if HAS_NETWORKING
-SRCS += ../libnetworking/pppd/libpppd$(LIB_VARIANT).a
-SRCS += ../libnetworking/rtems_servers/libftpd$(LIB_VARIANT).a
-SRCS += ../libnetworking/rtems_telnetd/libtelnetd$(LIB_VARIANT).a
+SRCS += ../libnetworking/pppd/libpppd.a
+SRCS += ../libnetworking/rtems_servers/libftpd.a
+SRCS += ../libnetworking/rtems_telnetd/libtelnetd.a
 endif
 
 if HAS_RDBG
-SRCS += ../librdbg/librdbg$(LIB_VARIANT).a
+SRCS += ../librdbg/librdbg.a
 endif
 
 # FIXME: ATM, there is no libcpu.a, anymore.
-# SRCS += $(wildcard $(PROJECT_LIB)/libcpu$(LIB_VARIANT).a)
+# SRCS += $(wildcard $(PROJECT_LIB)/libcpu.a)
 
 if LIBCHIP
-SRCS += ../libchip/librtcio$(LIB_VARIANT).a
-SRCS += ../libchip/libserialio$(LIB_VARIANT).a
-SRCS += ../libchip/libide$(LIB_VARIANT).a
+SRCS += ../libchip/librtcio.a
+SRCS += ../libchip/libserialio.a
+SRCS += ../libchip/libide.a
 if HAS_NETWORKING
-SRCS += ../libchip/libnetchip$(LIB_VARIANT).a
+SRCS += ../libchip/libnetchip.a
 endif
 endif
 
-SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor$(LIB_VARIANT).$(OBJEXT))
+SRCS += $(wildcard $(PROJECT_LIB)/lib/rtems-ctor.$(OBJEXT))
 
 if HAS_MP
-SRCS += ../libchip/shmdr$(LIB_VARIANT).rel
+SRCS += ../libchip/shmdr.rel
 endif
 
 all-local: $(TMPINSTALL_FILES)
 
-$(ARCH)/librtemsbsp$(LIB_VARIANT).a: $(SRCS)
+o-optimize/librtemsbsp.a: $(SRCS)
 	rm -f $@
-	$(mkdir_p) $(ARCH)
-	rm -rf $(ARCH)/*.a $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
+	$(mkdir_p) o-optimize
+	rm -rf o-optimize/*.a o-optimize/*.$(OBJEXT) o-optimize/*.rel
 	for f in $(SRCS); do \
 	  case $$f in \
 	  *.$(OBJEXT) | *.rel) \
-	    if test -f $(ARCH)/`basename $$f`; then \
-	      if cmp $$f $(ARCH)/`basename $$f`; then \
+	    if test -f o-optimize/`basename $$f`; then \
+	      if cmp $$f o-optimize/`basename $$f`; then \
 		true; \
 	      else \
 		echo 1>&2 "ERROR -- `basename $$f` in multiple files"; \
 		exit 1; \
 	      fi; \
 	    else \
-	      cp $$f $(ARCH)/; \
-	      chmod a-w $(ARCH)/`basename $$f`; \
+	      cp $$f o-optimize/; \
+	      chmod a-w o-optimize/`basename $$f`; \
 	    fi; \
 	    ;; \
 	  *.a) \
-	    cd $(ARCH); \
+	    cd o-optimize; \
 	      $(AR) xv ../$$f || exit 1; \
 	      chmod a-w * ; \
             cd ..; \
 	    ;; \
 	  esac; \
 	done
-	$(AR) rc $@ $(ARCH)/*
-	rm -f $(ARCH)/*.$(OBJEXT) $(ARCH)/*.rel
+	$(AR) rc $@ o-optimize/*
+	rm -f o-optimize/*.$(OBJEXT) o-optimize/*.rel
 	$(RANLIB) $@
 
 TMPINSTALL_FILES =
@@ -96,9 +89,9 @@ $(PROJECT_LIB)/$(dirstamp):
 	@: > $(PROJECT_LIB)/$(dirstamp)
 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
 
-$(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a: $(ARCH)/librtemsbsp$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
-	$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
-TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp$(LIB_VARIANT).a
+$(PROJECT_LIB)/librtemsbsp.a: o-optimize/librtemsbsp.a $(PROJECT_LIB)/$(dirstamp)
+	$(INSTALL_DATA) $< $(PROJECT_LIB)/librtemsbsp.a
+TMPINSTALL_FILES += $(PROJECT_LIB)/librtemsbsp.a
 
 CLEANFILES += $(TMPINSTALL_FILES)