2004-01-21 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* include/rdbg/Makefile.am: Add PREINSTALL_DIRS.
	* include/rdbg/i386/Makefile.am: Add PREINSTALL_DIRS.
	* include/rdbg/m68k/Makefile.am: Add PREINSTALL_DIRS.
	* include/rdbg/powerpc/Makefile.am: Add PREINSTALL_DIRS.
	* src/i386/Makefile.am: Add PREINSTALL_DIRS.
	* src/m68k/Makefile.am: Add PREINSTALL_DIRS.
	* src/powerpc/Makefile.am: Add PREINSTALL_DIRS.

1 files changed, 20 insertions, 29 deletions

diff --git a/c/src/librdbg/src/i386/Makefile.am b/c/src/librdbg/src/i386/Makefile.am
index b95ddb1f8c..c5cf180dbb 100644
--- a/c/src/librdbg/src/i386/Makefile.am
+++ b/c/src/librdbg/src/i386/Makefile.am
@@ -6,30 +6,28 @@ EXTRA_DIST = excep_f.c rdbg_cpu_asm.S rdbg_f.c
 
 RPCCPUDIR = $(RTEMS_CPU)/any
 
-project_lib_DATA = $(ARCH)/librdbg$(LIB_VARIANT).a
+EXTRA_LIBRARIES = librdbg.a
+CLEANFILES = librdbg.a
+librdbg_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_OPTIMIZE_V)
 
-C_FILES = excep_f.c rdbg_f.c
-C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
+EXTRA_LIBRARIES += librdbg_g.a
+CLEANFILES += librdbg_g.a
+librdbg_g_a_CPPFLAGS = $(AM_CPPFLAGS) $(CFLAGS_DEBUG_V)
+librdbg_g_a_SOURCES = $(librdbg_a_SOURCES)
 
-up_C_FILES = ../rdbg.c ../servcon.c ../servbkpt.c ../servrpc.c ../excep.c
-up_C_FILES += ../servtgt.c ../servtsp.c ../servutil.c ../_servtgt.c \
-    ../ptrace.c
-C_O_FILES += $(up_C_FILES:../%.c=$(ARCH)/%.$(OBJEXT))
+project_lib_DATA = librdbg$(LIB_VARIANT).a
+
+librdbg_a_SOURCES = excep_f.c rdbg_f.c
 
-${ARCH}/%.o: ../%.c $(ARCH)/$(dirstamp)
-	${COMPILE} -o $@ -c $<
+librdbg_a_SOURCES += ../rdbg.c ../servcon.c ../servbkpt.c ../servrpc.c \
+    ../excep.c ../servtgt.c ../servtsp.c ../servutil.c ../_servtgt.c \
+    ../ptrace.c
 
 # Asm source names
-S_FILES = rdbg_cpu_asm.S
-S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.$(OBJEXT))
+librdbg_a_SOURCES += rdbg_cpu_asm.S
 
 # Generated C source names
-GEN_C_FILES = any/remdeb_xdr.c
-GEN_C_FILES += any/remdeb_svc.c
-C_O_FILES += $(GEN_C_FILES:any/%.c=$(ARCH)/%.$(OBJEXT))
-
-${ARCH}/%.o: any/%.c $(ARCH)/$(dirstamp)
-	${COMPILE} -o $@ -c $<
+librdbg_a_SOURCES += any/remdeb_xdr.c any/remdeb_svc.c
 
 # H source names
 H_FILES = any/remdeb.h
@@ -37,22 +35,13 @@ H_FILES = any/remdeb.h
 # X source names
 X_FILES = ../remdeb.x any/remdeb_f.x
 
-OBJS = $(GEN_C_O_FILES) $(C_O_FILES) $(S_O_FILES)
-
 MAINTAINERCLEANFILES = $(H_FILES) $(GEN_C_FILES)
 
 include $(top_srcdir)/automake/compile.am
 include $(top_srcdir)/automake/lib.am
 
-#
-# Add local stuff here using +=
-#
-
 FRONTEND = \"$(RPCCPUDIR)/remdeb_f.x\"
 
-$(ARCH)/librdbg$(LIB_VARIANT).a: ${OBJS}
-	$(make-library)
-
 $(srcdir)/any/remdeb.h: $(X_FILES)
 if RPCTOOLS
 	@rm -f $@
@@ -88,6 +77,7 @@ all-local: $(PREINSTALL_FILES) $(TMPINSTALL_FILES)
 
 EXTRA_DIST += remdeb_f.x $(GEN_C_FILES)
 
+PREINSTALL_DIRS =
 PREINSTALL_FILES =
 TMPINSTALL_FILES =
 
@@ -96,20 +86,21 @@ $(PROJECT_LIB)/$(dirstamp):
 	@: > $(PROJECT_LIB)/$(dirstamp)
 TMPINSTALL_FILES += $(PROJECT_LIB)/$(dirstamp)
 
-$(PROJECT_LIB)/librdbg$(LIB_VARIANT).a: $(ARCH)/librdbg$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
+$(PROJECT_LIB)/librdbg$(LIB_VARIANT).a: librdbg$(LIB_VARIANT).a $(PROJECT_LIB)/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
 TMPINSTALL_FILES += $(PROJECT_LIB)/librdbg$(LIB_VARIANT).a
 
 $(PROJECT_INCLUDE)/rdbg/$(dirstamp):
 	@$(mkdir_p) $(PROJECT_INCLUDE)/rdbg
 	@: > $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
-PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
+PREINSTALL_DIRS += $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
 
 $(PROJECT_INCLUDE)/rdbg/remdeb.h: $(srcdir)/any/remdeb.h $(PROJECT_INCLUDE)/rdbg/$(dirstamp)
 	$(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rdbg/remdeb.h
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg/remdeb.h
 
-CLEANFILES = $(PREINSTALL_FILES)
+CLEANFILES += $(PREINSTALL_FILES)
+DISTCLEANFILES = $(PREINSTALL_DIRS)
 CLEANFILES += $(TMPINSTALL_FILES)
 
 include $(top_srcdir)/automake/local.am