diff options
author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:12:40 +0000 |
---|---|---|
committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2003-09-29 10:12:40 +0000 |
commit | d348010c03f9b397596a2dfab3e8e0cba8d9481c (patch) | |
tree | 7482cb5df25b215c87624a773c3131dfd3c619f8 /c/src/lib/libbsp/arm/edb7312 | |
parent | 2003-09-29 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff) | |
download | rtems-d348010c03f9b397596a2dfab3e8e0cba8d9481c.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/arm/edb7312')
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/ChangeLog | 7 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/Makefile.am | 18 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/configure.ac | 1 | ||||
-rw-r--r-- | c/src/lib/libbsp/arm/edb7312/include/Makefile.am | 24 |
4 files changed, 22 insertions, 28 deletions
diff --git a/c/src/lib/libbsp/arm/edb7312/ChangeLog b/c/src/lib/libbsp/arm/edb7312/ChangeLog index c0c23885e6..6cae5c5c2d 100644 --- a/c/src/lib/libbsp/arm/edb7312/ChangeLog +++ b/c/src/lib/libbsp/arm/edb7312/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-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de> * bsp_specs: Remove *lib:. diff --git a/c/src/lib/libbsp/arm/edb7312/Makefile.am b/c/src/lib/libbsp/arm/edb7312/Makefile.am index b7fc207653..f3142a51dd 100644 --- a/c/src/lib/libbsp/arm/edb7312/Makefile.am +++ b/c/src/lib/libbsp/arm/edb7312/Makefile.am @@ -5,12 +5,24 @@ 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 clock console irq startup timer start network wrapup +# from the individual .rel files built in other directories +SUBDIRS = . clock console irq startup timer start network wrapup include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs +include_HEADERS += include/ep7312.h + +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +$(PROJECT_INCLUDE)/ep7312.h: include/ep7312.h + $(INSTALL_DATA) $< $@ +PREINSTALL_FILES += $(PROJECT_INCLUDE)/ep7312.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/arm/edb7312/configure.ac b/c/src/lib/libbsp/arm/edb7312/configure.ac index 9e4b96a0b0..aad8156bad 100644 --- a/c/src/lib/libbsp/arm/edb7312/configure.ac +++ b/c/src/lib/libbsp/arm/edb7312/configure.ac @@ -21,7 +21,6 @@ AM_CONDITIONAL(HAS_NETWORKING,test "$HAS_NETWORKING" = "yes") AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile irq/Makefile start/Makefile startup/Makefile diff --git a/c/src/lib/libbsp/arm/edb7312/include/Makefile.am b/c/src/lib/libbsp/arm/edb7312/include/Makefile.am deleted file mode 100644 index 25d739c993..0000000000 --- a/c/src/lib/libbsp/arm/edb7312/include/Makefile.am +++ /dev/null @@ -1,24 +0,0 @@ -## -## $Id$ -## - -include_HEADERS = bsp.h coverhd.h bspopts.h ep7312.h - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ - -CLEANFILES = coverhd.h - - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am |