5 files changed, 47 insertions, 57 deletions
diff --git a/c/src/exec/score/cpu/hppa1.1/ChangeLog b/c/src/exec/score/cpu/hppa1.1/ChangeLog
index 1424e50876..8f9f13bf49 100644
--- a/c/src/exec/score/cpu/hppa1.1/ChangeLog
+++ b/c/src/exec/score/cpu/hppa1.1/ChangeLog
@@ -1,3 +1,10 @@
+2002-01-29	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+	* rtems/Makefile.am: Removed.
+	* rtems/score/Makefile.am: Removed.
+	* configure.ac: Reflect changes above.
+	* Makefile.am: Reflect changes above.
+
 2001-12-19	Ralf Corsepius <corsepiu@faw.uni-ulm.de>
 
 	* Makefile.am: Add multilib support.
diff --git a/c/src/exec/score/cpu/hppa1.1/Makefile.am b/c/src/exec/score/cpu/hppa1.1/Makefile.am
index 85f3c7a67c..6a08f979ff 100644
--- a/c/src/exec/score/cpu/hppa1.1/Makefile.am
+++ b/c/src/exec/score/cpu/hppa1.1/Makefile.am
@@ -2,10 +2,37 @@
 ## $Id$
 ##
 
-AUTOMAKE_OPTIONS = foreign 1.4
+AUTOMAKE_OPTIONS = foreign 1.5
 ACLOCAL_AMFLAGS = -I ../../../../../../aclocal
 
-SUBDIRS = rtems
+include $(top_srcdir)/../../../../../../automake/multilib.am
+include $(top_srcdir)/../../../../../../automake/compile.am
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+$(PROJECT_INCLUDE)/%.h: %.h
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_INCLUDE):
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/rtems:
+	$(mkinstalldirs) $@
+
+$(PROJECT_INCLUDE)/rtems/score:
+	$(mkinstalldirs) $@
+
+include_HEADERS= asm.h
+PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
+
+include_rtems_scoredir = $(includedir)/rtems/score
+include_rtems_score_HEADERS = \
+    rtems/score/cpu.h \
+    rtems/score/cpu_asm.h \
+    rtems/score/hppa.h \
+    rtems/score/hppatypes.h \
+    rtems/score/offsets.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/score \
+    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/%.h)
 
 C_FILES = cpu.c
 C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
@@ -13,10 +40,6 @@ C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o)
 S_FILES = cpu_asm.S
 S_O_FILES = $(S_FILES:%.S=$(ARCH)/%.o)
 
-include $(top_srcdir)/../../../../../../automake/multilib.am
-include $(top_srcdir)/../../../../../../automake/compile.am
-include $(top_srcdir)/../../../../../../automake/lib.am
-
 REL = $(ARCH)/rtems-cpu.rel
 
 rtems_cpu_rel_OBJECTS = $(C_O_FILES) $(S_O_FILES)
@@ -33,5 +56,14 @@ all-local: $(ARCH) $(rtems_cpu_rel_OBJECTS) $(REL) \
 
 EXTRA_DIST = cpu.c cpu_asm.S rtems.S
 
-include $(top_srcdir)/../../../../../../automake/subdirs.am
+# FIXME: We should get rid of genoffsets
+GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets
+
+GENERIC_H_FILES = rtems/score/offsets.h
+rtems/score/offsets.h: $(GENOFFSETS) cpu.h
+	@(mkinstalldirs) rtems/score
+	$(RM) $@
+	$(GENOFFSETS) > $@
+CLEANFILES = rtems/score/offsets.h
+
 include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/exec/score/cpu/hppa1.1/configure.ac b/c/src/exec/score/cpu/hppa1.1/configure.ac
index 45f67ae807..e8fb31eaa3 100644
--- a/c/src/exec/score/cpu/hppa1.1/configure.ac
+++ b/c/src/exec/score/cpu/hppa1.1/configure.ac
@@ -26,7 +26,5 @@ RTEMS_CANONICALIZE_TOOLS
 RTEMS_CHECK_NEWLIB
 
 # Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-rtems/Makefile
-rtems/score/Makefile])
+AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am
index ef7df82af7..e69de29bb2 100644
--- a/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am
+++ b/c/src/exec/score/cpu/hppa1.1/rtems/Makefile.am
@@ -1,10 +0,0 @@
-##
-## $Id$
-##
-
-AUTOMAKE_OPTIONS = foreign 1.4
-
-SUBDIRS = score
-
-include $(top_srcdir)/../../../../../../automake/subdirs.am
-include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am
index 93f481ec79..e69de29bb2 100644
--- a/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am
+++ b/c/src/exec/score/cpu/hppa1.1/rtems/score/Makefile.am
@@ -1,37 +0,0 @@
-##
-## $Id$
-##
-## FIXME: Handling of offsets.h needs to be reworked.
-##
-AUTOMAKE_OPTIONS = foreign 1.4
-
-include_rtems_scoredir = $(includedir)/rtems/score
-
-GENOFFSETS = $(PROJECT_TOPdir)/tools/cpu/hppa1.1/genoffsets
-
-GENERIC_H_FILES = offsets.h
-include_rtems_score_HEADERS = cpu.h cpu_asm.h hppa.h hppatypes.h
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-offsets.h: $(GENOFFSETS) cpu.h
-	$(RM) $@
-	$(GENOFFSETS) > $@
-
-CLEANFILES = offsets.h
-
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems/score \
-    $(include_rtems_score_HEADERS:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h) \
-    $(GENERIC_H_FILES:%.h=$(PROJECT_INCLUDE)/rtems/score/%.h)
-
-$(PROJECT_INCLUDE)/rtems/score:
-	$(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/rtems/score/%.h: %.h
-	$(INSTALL_DATA) $< $@
-
-all-local: $(PREINSTALL_FILES)
-
-include $(top_srcdir)/../../../../../../automake/local.am