diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:39:05 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:39:05 +0000 |
| commit | d1b210cd17037565daf172975aff68cdadbb9944 (patch) | |
| tree | eaac039cbeb0821d1338c51f0b5cd0424e95fd5d /c/src/lib/libbsp/i386/i386ex | |
| parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
| download | rtems-d1b210cd17037565daf172975aff68cdadbb9944.tar.bz2 | |
2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
Reflect changes to bsp.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
Diffstat (limited to 'c/src/lib/libbsp/i386/i386ex')
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/ChangeLog | 7 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/Makefile.am | 12 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/configure.ac | 1 | ||||
| -rw-r--r-- | c/src/lib/libbsp/i386/i386ex/include/Makefile.am | 19 |
4 files changed, 16 insertions, 23 deletions
diff --git a/c/src/lib/libbsp/i386/i386ex/ChangeLog b/c/src/lib/libbsp/i386/i386ex/ChangeLog index b1c2603218..a384c28962 100644 --- a/c/src/lib/libbsp/i386/i386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/i386ex/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-08 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/i386/i386ex/Makefile.am b/c/src/lib/libbsp/i386/i386ex/Makefile.am index 31ff58222c..e7f1014cbf 100644 --- a/c/src/lib/libbsp/i386/i386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/i386ex/Makefile.am @@ -5,12 +5,18 @@ ACLOCAL_AMFLAGS = -I ../../../../aclocal # wrapup is the one that actually builds and installs the library -# from the individual .rel files built in other directories -SUBDIRS = . include start startup clock console timer network wrapup +# from the individual .rel files built in other directories +SUBDIRS = . start startup clock console timer network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(PROJECT_INCLUDE)/coverhd.h: include/coverhd.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/coverhd.h include $(top_srcdir)/../../../../automake/subdirs.am include $(top_srcdir)/../../../../automake/local.am diff --git a/c/src/lib/libbsp/i386/i386ex/configure.ac b/c/src/lib/libbsp/i386/i386ex/configure.ac index bc835d4b19..af24251945 100644 --- a/c/src/lib/libbsp/i386/i386ex/configure.ac +++ b/c/src/lib/libbsp/i386/i386ex/configure.ac @@ -27,7 +27,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am b/c/src/lib/libbsp/i386/i386ex/include/Makefile.am deleted file mode 100644 index 3211a07f19..0000000000 --- a/c/src/lib/libbsp/i386/i386ex/include/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h coverhd.h bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am |