Changeset 9608320 in rtems for c/src/librdbg/include

Timestamp:

11/22/99 13:41:11 (24 years ago)

Author:

Joel Sherrill <joel.sherrill@…>

Branches:

4.10, 4.11, 4.8, 4.9, 5, master

Children:

27ea47c

Parents:

75f2b0b

Message:

Patch rtems-rc-19991117-4.diff from Ralf Corsepius <corsepiu@…>:

.. a major configuration cleanup
... major enhancement of automake support.

... and it contains a *major* breakthough:

Automake support for libchip and libmisc *LEAF* directories.

To implement this I have used several nasty tricks

• The basical trick is to wrap an old Makefile.in's contents into a Makefile.am and still continue to use (i.e include) the old *.cfg files.

• Replaced each INSTALL_IF_CHANGE and INSTALL_VARIANT with make dependencies
• Add a gnu-make ifdef AUTOMAKE to main.cfg to avoid conflicts between automake and RTEMS make rules
• Replaced each install:: and preinstall:: rule with make dependencies
• Replaced SUB_DIRS with SUBDIRS in all Makefile.ins (Automake convention)
• Removed each manually added autoconf substitution which automake performs automatically.

This is not yet full automake support, because using the temporary
installation directory, preinstallation in general and building variants
are in contradiction to automake's basic working principles ...

... the new Makefile.ams work still somewhat clumsy
... nevertheless they work (quite well).

WARNING:

At first glance this patch is small, but

• it affects the whole configuration system.
• it opens the road to introducing automake to all Makefile.ins currently not being under automake control.

JOEL> Does this remove or add any files?

Both, all Makefile.ins below libchip and libmisc get replaced with
Makefile.ams.

Location:

c/src/librdbg/include/rdbg

Files:

• Makefile.am (modified) (2 diffs)
• i386/Makefile.am (modified) (3 diffs)
• powerpc/Makefile.am (modified) (3 diffs)

c/src/librdbg/include/rdbg/Makefile.am

@@ -6 +6 @@
 
 if HAS_RDBG
-H_PIECES = rdbg.h servrpc.h
+H_FILES = rdbg.h servrpc.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rdbg \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
@@ -20 +20 @@
 endif
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 if HAS_RDBG

c/src/librdbg/include/rdbg/i386/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = rdbg_f.h reg.h
+H_FILES = rdbg_f.h reg.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-##TMPINSTALL_FILES = \
+##PREINSTALL_FILES = \
 ##$(PROJECT_INCLUDE)/rdbg/i386 \
 ##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/i386/%)
@@ -18 +18 @@
 ##      $(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rdbg \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
@@ -27 +27 @@
         $(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am

c/src/librdbg/include/rdbg/powerpc/Makefile.am

@@ -5 +5 @@
 AUTOMAKE_OPTIONS = foreign 1.4
 
-H_PIECES = rdbg_f.h reg.h
+H_FILES = rdbg_f.h reg.h
 
-noinst_HEADERS = $(H_PIECES)
+noinst_HEADERS = $(H_FILES)
 
-##TMPINSTALL_FILES = \
+##PREINSTALL_FILES = \
 ##$(PROJECT_INCLUDE)/rdbg/powerpc \
 ##$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/powerpc/%)
@@ -18 +18 @@
 ##      $(INSTALL_DATA) $< $@
 
-TMPINSTALL_FILES = \
+PREINSTALL_FILES = \
 $(PROJECT_INCLUDE)/rdbg \
 $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rdbg/%)
@@ -27 +27 @@
         $(INSTALL_DATA) $< $@
 
-all-am: $(TMPINSTALL_FILES)
-debug-am: $(TMPINSTALL_FILES)
-profile-am: $(TMPINSTALL_FILES)
+all-am: $(PREINSTALL_FILES)
+debug-am: $(PREINSTALL_FILES)
+profile-am: $(PREINSTALL_FILES)
 
 include $(top_srcdir)/../../../automake/local.am