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/pc386 | |
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/pc386')
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/Makefile.am | 33 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/i386/pc386/include/Makefile.am | 31 |
4 files changed, 36 insertions, 36 deletions
diff --git a/c/src/lib/libbsp/i386/pc386/ChangeLog b/c/src/lib/libbsp/i386/pc386/ChangeLog index 138fc4f1b4..b9d124e025 100644 --- a/c/src/lib/libbsp/i386/pc386/ChangeLog +++ b/c/src/lib/libbsp/i386/pc386/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/pc386/Makefile.am b/c/src/lib/libbsp/i386/pc386/Makefile.am index 2784052e50..b9518547a7 100644 --- a/c/src/lib/libbsp/i386/pc386/Makefile.am +++ b/c/src/lib/libbsp/i386/pc386/Makefile.am @@ -5,9 +5,9 @@ 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 ne2000 wd8003 \ - 3c509 ide wrapup +# from the individual .rel files built in other directories +SUBDIRS = . tools start startup clock console timer ne2000 wd8003 3c509 ide \ + wrapup include $(top_srcdir)/../../bsp.am @@ -16,7 +16,32 @@ $(PROJECT_RELEASE)/BootImgs: TMPINSTALL_FILES = $(PROJECT_RELEASE)/BootImgs -EXTRA_DIST = HOWTO README.dec21140 STATUS bsp_specs times_i486dx times_p5 +# This driver needs to be reworked for the BSD stack. +# We only install wd80x3.h if HAS_NETWORKING was defined +if HAS_NETWORKING +include_HEADERS += include/wd80x3.h +endif + +include_HEADERS += include/crt.h +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = HOWTO README.dec21140 STATUS times_i486dx times_p5 + +if HAS_NETWORKING +$(PROJECT_INCLUDE)/wd80x3.h: include/wd80x3.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/wd80x3.h +endif + +$(PROJECT_INCLUDE)/crt.h: include/crt.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/crt.h + +$(PROJECT_INCLUDE)/coverhd.h: $(top_srcdir)/../../shared/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/pc386/configure.ac b/c/src/lib/libbsp/i386/pc386/configure.ac index 184be2a2e9..6467145531 100644 --- a/c/src/lib/libbsp/i386/pc386/configure.ac +++ b/c/src/lib/libbsp/i386/pc386/configure.ac @@ -30,7 +30,6 @@ AC_SUBST(RTEMS_BSP) AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile start/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/i386/pc386/include/Makefile.am b/c/src/lib/libbsp/i386/pc386/include/Makefile.am deleted file mode 100644 index 286070063b..0000000000 --- a/c/src/lib/libbsp/i386/pc386/include/Makefile.am +++ /dev/null @@ -1,31 +0,0 @@ -## -## $Id$ -## - - -# This driver needs to be reworked for the BSD stack. -# We only install wd80x3.h if HAS_NETWORKING was defined -if HAS_NETWORKING -WD80X3 = wd80x3.h -endif - -include_HEADERS = bsp.h crt.h coverhd.h $(WD80X3) bspopts.h - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = coverhd.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 |