From 82a7f58038fb9d7eb897241bd2d8ea6ecac5a05b Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Mon, 29 Sep 2003 09:56:23 +0000 Subject: 2003-09-29 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. Reflect changes to bsp.am. * include/Makefile.am: Remove. * configure.ac: Reflect changes above. --- c/src/lib/libbsp/unix/posix/ChangeLog | 7 +++++++ c/src/lib/libbsp/unix/posix/Makefile.am | 14 +++++++++++--- c/src/lib/libbsp/unix/posix/configure.ac | 1 - c/src/lib/libbsp/unix/posix/include/Makefile.am | 22 ---------------------- 4 files changed, 18 insertions(+), 26 deletions(-) delete mode 100644 c/src/lib/libbsp/unix/posix/include/Makefile.am (limited to 'c/src/lib/libbsp/unix/posix') diff --git a/c/src/lib/libbsp/unix/posix/ChangeLog b/c/src/lib/libbsp/unix/posix/ChangeLog index e6ff8dbfbb..a30eb0815f 100644 --- a/c/src/lib/libbsp/unix/posix/ChangeLog +++ b/c/src/lib/libbsp/unix/posix/ChangeLog @@ -1,3 +1,10 @@ +2003-09-29 Ralf Corsepius + + * Makefile.am: Merge-in include/Makefile.am. + Reflect changes to bsp.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect changes above. + 2003-09-26 Joel Sherrill * timer/timer.c: Obsoleting HP PA-RISC port and removing all diff --git a/c/src/lib/libbsp/unix/posix/Makefile.am b/c/src/lib/libbsp/unix/posix/Makefile.am index 4d42be5962..32ab1683ca 100644 --- a/c/src/lib/libbsp/unix/posix/Makefile.am +++ b/c/src/lib/libbsp/unix/posix/Makefile.am @@ -5,12 +5,20 @@ 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 startup clock console timer shmsupp wrapup tools +# from the individual .rel files built in other directories +SUBDIRS = . startup clock console timer shmsupp wrapup tools include $(top_srcdir)/../../bsp.am -EXTRA_DIST = bsp_specs times +nodist_include_HEADERS += $(top_srcdir)/../../shared/include/coverhd.h + +all-local: $(PREINSTALL_FILES) + +EXTRA_DIST = times + +$(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/unix/posix/configure.ac b/c/src/lib/libbsp/unix/posix/configure.ac index 65b79df86d..a8c0c1fc44 100644 --- a/c/src/lib/libbsp/unix/posix/configure.ac +++ b/c/src/lib/libbsp/unix/posix/configure.ac @@ -40,7 +40,6 @@ RTEMS_BSPOPTS_HELP([HEAPSPACE_MB], AC_CONFIG_FILES([Makefile clock/Makefile console/Makefile -include/Makefile shmsupp/Makefile startup/Makefile timer/Makefile diff --git a/c/src/lib/libbsp/unix/posix/include/Makefile.am b/c/src/lib/libbsp/unix/posix/include/Makefile.am deleted file mode 100644 index ec3e63c3a0..0000000000 --- a/c/src/lib/libbsp/unix/posix/include/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - - -include_HEADERS = bsp.h bspopts.h coverhd.h - -$(PROJECT_INCLUDE): - $(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -coverhd.h: $(top_srcdir)/../../shared/include/coverhd.h - cp $< $@ -CLEANFILES = coverhd.h - -TMPINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(TMPINSTALL_FILES) - -include $(top_srcdir)/../../../../automake/local.am -- cgit v1.2.3