summaryrefslogtreecommitdiffstats
path: root/c
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-12 14:43:03 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2001-02-12 14:43:03 +0000
commitf79d96e1a3ac5eaa1faffc3724d3ab92fdc08ac8 (patch)
tree0c93e3b021ed4d5aa595bba61ba8db341091c4cf /c
parent2001-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-f79d96e1a3ac5eaa1faffc3724d3ab92fdc08ac8.tar.bz2
2001-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rdbg/Makefile.am, include/rdbg/i386/Makefile.am, include/rdbg/m68k/Makefile.am, include/rdbg/powerpc/Makefile.am: Cleanup including more proper style on include files.
Diffstat (limited to '')
-rw-r--r--c/src/librdbg/ChangeLog6
-rw-r--r--c/src/librdbg/include/rdbg/Makefile.am10
-rw-r--r--c/src/librdbg/include/rdbg/i386/Makefile.am15
-rw-r--r--c/src/librdbg/include/rdbg/m68k/Makefile.am15
-rw-r--r--c/src/librdbg/include/rdbg/powerpc/Makefile.am15
5 files changed, 21 insertions, 40 deletions
diff --git a/c/src/librdbg/ChangeLog b/c/src/librdbg/ChangeLog
index edd1c83336..aa7644d16f 100644
--- a/c/src/librdbg/ChangeLog
+++ b/c/src/librdbg/ChangeLog
@@ -1,3 +1,9 @@
+2001-02-04 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * include/rdbg/Makefile.am, include/rdbg/i386/Makefile.am,
+ include/rdbg/m68k/Makefile.am, include/rdbg/powerpc/Makefile.am:
+ Cleanup including more proper style on include files.
+
2000-11-09 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Use ... instead of RTEMS_TOPdir in ACLOCAL_AMFLAGS.
diff --git a/c/src/librdbg/include/rdbg/Makefile.am b/c/src/librdbg/include/rdbg/Makefile.am
index 20557ec68e..f21aa12cf4 100644
--- a/c/src/librdbg/include/rdbg/Makefile.am
+++ b/c/src/librdbg/include/rdbg/Makefile.am
@@ -4,13 +4,13 @@
AUTOMAKE_OPTIONS = foreign 1.4
-if HAS_RDBG
-H_FILES = rdbg.h servrpc.h
+include_rdbgdir = $(includedir)/rdbg
-noinst_HEADERS = $(H_FILES)
+if HAS_RDBG
+include_rdbg_HEADERS = rdbg.h servrpc.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+ $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
$(PROJECT_INCLUDE)/rdbg:
@$(mkinstalldirs) $@
@@ -24,5 +24,7 @@ if HAS_RDBG
SUBDIRS = $(RTEMS_CPU)
endif
+EXTRA_DIST = rdbg.h servrpc.h
+
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/librdbg/include/rdbg/i386/Makefile.am b/c/src/librdbg/include/rdbg/i386/Makefile.am
index df70315c7a..5ddae373e5 100644
--- a/c/src/librdbg/include/rdbg/i386/Makefile.am
+++ b/c/src/librdbg/include/rdbg/i386/Makefile.am
@@ -4,21 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = rdbg_f.h reg.h
+include_rdbgdir = $(includedir)/rdbg
-noinst_HEADERS = $(H_FILES)
-
-##PREINSTALL_FILES = \
-##$(PROJECT_INCLUDE)/rdbg/i386 \
-##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/i386/%)
-
-##$(PROJECT_INCLUDE)/rdbg/i386:
-## @$(mkinstalldirs) $@
-##$(PROJECT_INCLUDE)/rdbg/i386/%.h: %.h
-## $(INSTALL_DATA) $< $@
+include_rdbg_HEADERS = rdbg_f.h reg.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+ $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
$(PROJECT_INCLUDE)/rdbg:
@$(mkinstalldirs) $@
diff --git a/c/src/librdbg/include/rdbg/m68k/Makefile.am b/c/src/librdbg/include/rdbg/m68k/Makefile.am
index 2507c47d79..5ddae373e5 100644
--- a/c/src/librdbg/include/rdbg/m68k/Makefile.am
+++ b/c/src/librdbg/include/rdbg/m68k/Makefile.am
@@ -4,21 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = rdbg_f.h reg.h
+include_rdbgdir = $(includedir)/rdbg
-noinst_HEADERS = $(H_FILES)
-
-##PREINSTALL_FILES = \
-##$(PROJECT_INCLUDE)/rdbg/m68k \
-##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/m68k/%)
-
-##$(PROJECT_INCLUDE)/rdbg/m68k:
-## @$(mkinstalldirs) $@
-##$(PROJECT_INCLUDE)/rdbg/m68k/%.h: %.h
-## $(INSTALL_DATA) $< $@
+include_rdbg_HEADERS = rdbg_f.h reg.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+ $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
$(PROJECT_INCLUDE)/rdbg:
@$(mkinstalldirs) $@
diff --git a/c/src/librdbg/include/rdbg/powerpc/Makefile.am b/c/src/librdbg/include/rdbg/powerpc/Makefile.am
index 7eec4212a3..5ddae373e5 100644
--- a/c/src/librdbg/include/rdbg/powerpc/Makefile.am
+++ b/c/src/librdbg/include/rdbg/powerpc/Makefile.am
@@ -4,21 +4,12 @@
AUTOMAKE_OPTIONS = foreign 1.4
-H_FILES = rdbg_f.h reg.h
+include_rdbgdir = $(includedir)/rdbg
-noinst_HEADERS = $(H_FILES)
-
-##PREINSTALL_FILES = \
-##$(PROJECT_INCLUDE)/rdbg/powerpc \
-##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/powerpc/%)
-
-##$(PROJECT_INCLUDE)/rdbg/powerpc:
-## @$(mkinstalldirs) $@
-##$(PROJECT_INCLUDE)/rdbg/powerpc/%.h: %.h
-## $(INSTALL_DATA) $< $@
+include_rdbg_HEADERS = rdbg_f.h reg.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rdbg \
- $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
+ $(include_rdbg_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
$(PROJECT_INCLUDE)/rdbg:
@$(mkinstalldirs) $@