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/ts_386ex | |
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/ts_386ex')
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/Makefile.am | 22 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am | 24 |
4 files changed, 26 insertions, 28 deletions
diff --git a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog b/c/src/lib/libbsp/i386/ts_386ex/ChangeLog index 1251dc8580..f9212911b7 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/ChangeLog +++ b/c/src/lib/libbsp/i386/ts_386ex/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/ts_386ex/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am index 96eb812f27..a84e55c117 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/Makefile.am +++ b/c/src/lib/libbsp/i386/ts_386ex/Makefile.am @@ -5,12 +5,28 @@ 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 tools start startup clock console timer network wrapup +# from the individual .rel files built in other directories +SUBDIRS = . tools start startup clock console timer network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +if HAS_NETWORKING +include_HEADERS += include/wd80x3.h +endif + +include_HEADERS += include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +if HAS_NETWORKING +$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h +endif + +$(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/ts_386ex/configure.ac b/c/src/lib/libbsp/i386/ts_386ex/configure.ac index 5c4f9da87d..fe2d2be176 100644 --- a/c/src/lib/libbsp/i386/ts_386ex/configure.ac +++ b/c/src/lib/libbsp/i386/ts_386ex/configure.ac @@ -43,7 +43,6 @@ RTEMS_BSPOPTS_HELP([UARTDEBUG], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am b/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am deleted file mode 100644 index 2f1a040dd3..0000000000 --- a/c/src/lib/libbsp/i386/ts_386ex/include/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## -## $Id$ -## - - -if HAS_NETWORKING -NETWORK_H_FILES = wd80x3.h -endif - -include_HEADERS = bsp.h coverhd.h wd80x3.h $(NETWORK_H_FILES) bspopts.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -EXTRA_DIST = wd80x3.h - -include $(top_srcdir)/../../../../automake/local.am |