diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-22 13:41:11 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 1999-11-22 13:41:11 +0000 |
commit | 9608320702e8dba9947987cd34001824638c434e (patch) | |
tree | 4352f820543cb2755ff8d6cfa2d9a0e7d0fc7544 /c/src/exec/itron | |
parent | Small patch (rtems-rc-19991117-5.diff) from Ralf Corsepius (diff) | |
download | rtems-9608320702e8dba9947987cd34001824638c434e.tar.bz2 |
Patch rtems-rc-19991117-4.diff from Ralf Corsepius <corsepiu@faw.uni-ulm.de>:
.. 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.
Diffstat (limited to 'c/src/exec/itron')
-rw-r--r-- | c/src/exec/itron/include/Makefile.am | 12 | ||||
-rw-r--r-- | c/src/exec/itron/include/itronsys/Makefile.am | 12 | ||||
-rw-r--r-- | c/src/exec/itron/include/rtems/itron/Makefile.am | 14 | ||||
-rw-r--r-- | c/src/exec/itron/inline/rtems/itron/Makefile.am | 14 |
4 files changed, 26 insertions, 26 deletions
diff --git a/c/src/exec/itron/include/Makefile.am b/c/src/exec/itron/include/Makefile.am index f83468dd1b..a12590301a 100644 --- a/c/src/exec/itron/include/Makefile.am +++ b/c/src/exec/itron/include/Makefile.am @@ -4,11 +4,11 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = itron.h +H_FILES = itron.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE) \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%) @@ -17,9 +17,9 @@ $(PROJECT_INCLUDE): $(PROJECT_INCLUDE)/%.h: %.h $(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) SUBDIRS = rtems itronsys diff --git a/c/src/exec/itron/include/itronsys/Makefile.am b/c/src/exec/itron/include/itronsys/Makefile.am index c7a7286285..25bcd64a2a 100644 --- a/c/src/exec/itron/include/itronsys/Makefile.am +++ b/c/src/exec/itron/include/itronsys/Makefile.am @@ -4,12 +4,12 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h \ +H_FILES = eventflags.h fmempool.h intr.h mbox.h msgbuffer.h network.h \ port.h semaphore.h status.h sysmgmt.h task.h time.h types.h vmempool.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/itronsys \ $(noinst_HEADERS:%=$(PROJECT_INCLUDE)/itronsys/%) @@ -18,8 +18,8 @@ $(PROJECT_INCLUDE)/itronsys: $(PROJECT_INCLUDE)/itronsys/%.h: %.h $(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 diff --git a/c/src/exec/itron/include/rtems/itron/Makefile.am b/c/src/exec/itron/include/rtems/itron/Makefile.am index d295a8b02d..542ea135fd 100644 --- a/c/src/exec/itron/include/rtems/itron/Makefile.am +++ b/c/src/exec/itron/include/rtems/itron/Makefile.am @@ -4,24 +4,24 @@ AUTOMAKE_OPTIONS = foreign 1.4 -H_PIECES = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \ +H_FILES = config.h eventflags.h fmempool.h intr.h itronapi.h mbox.h \ msgbuffer.h network.h object.h port.h semaphore.h sysmgmt.h \ task.h time.h vmempool.h -noinst_HEADERS = $(H_PIECES) +noinst_HEADERS = $(H_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/itron \ -$(H_PIECES:%=$(PROJECT_INCLUDE)/rtems/itron/%) +$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%) $(PROJECT_INCLUDE)/rtems/itron: @$(mkinstalldirs) $@ $(PROJECT_INCLUDE)/rtems/itron/%.h: %.h $(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) EXTRA_DIST = README diff --git a/c/src/exec/itron/inline/rtems/itron/Makefile.am b/c/src/exec/itron/inline/rtems/itron/Makefile.am index 52a0ec2de6..659227b218 100644 --- a/c/src/exec/itron/inline/rtems/itron/Makefile.am +++ b/c/src/exec/itron/inline/rtems/itron/Makefile.am @@ -4,15 +4,15 @@ AUTOMAKE_OPTIONS = foreign 1.4 if INLINE -I_PIECES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \ +I_FILES = eventflags.inl fmempool.inl intr.inl mbox.inl msgbuffer.inl \ network.inl port.inl semaphore.inl sysmgmt.inl task.inl \ time.inl vmempool.inl -noinst_HEADERS = $(I_PIECES) +noinst_HEADERS = $(I_FILES) -TMPINSTALL_FILES = \ +PREINSTALL_FILES = \ $(PROJECT_INCLUDE)/rtems/itron \ -$(I_PIECES:%=$(PROJECT_INCLUDE)/rtems/itron/%) +$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/itron/%) $(PROJECT_INCLUDE)/rtems/itron: @$(mkinstalldirs) $@ @@ -20,8 +20,8 @@ $(PROJECT_INCLUDE)/rtems/itron/%.inl: %.inl $(INSTALL_DATA) $< $@ 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) include $(top_srcdir)/../../../../automake/local.am |