From 71e66df3ce4643964d4baffad6bb2426df9007b4 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Wed, 24 Sep 2003 08:11:33 +0000 Subject: 2003-09-24 Ralf Corsepius * Makefile.am: Merge-in include/Makefile.am. * include/Makefile.am: Remove. * configure.ac: Reflect having removed include/Makefile.am and librpc/include/Makefile.am. --- cpukit/ChangeLog | 7 +++++++ cpukit/Makefile.am | 22 +++++++++++++++++++++- cpukit/configure.ac | 2 -- cpukit/include/Makefile.am | 27 --------------------------- 4 files changed, 28 insertions(+), 30 deletions(-) delete mode 100644 cpukit/include/Makefile.am (limited to 'cpukit') diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index a581534548..8e2842b224 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,10 @@ +2003-09-24 Ralf Corsepius + + * Makefile.am: Merge-in include/Makefile.am. + * include/Makefile.am: Remove. + * configure.ac: Reflect having removed include/Makefile.am and + librpc/include/Makefile.am. + 2003-09-04 Joel Sherrill * include/rtems/bspIo.h, include/rtems/fs.h, include/rtems/userenv.h: diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am index 9a41ac6cad..9512ddda6d 100644 --- a/cpukit/Makefile.am +++ b/cpukit/Makefile.am @@ -6,7 +6,7 @@ ACLOCAL_AMFLAGS = -I aclocal include $(top_srcdir)/automake/multilib.am -SUBDIRS = . include ada score rtems sapi posix itron +SUBDIRS = . ada score rtems sapi posix itron SUBDIRS += libcsupport libblock libfs SUBDIRS += libnetworking librpc SUBDIRS += libmisc @@ -19,6 +19,26 @@ preinstall-stamp: touch preinstall-stamp CLEANFILES = preinstall-stamp +$(PROJECT_INCLUDE)/%.h: include/%.h + $(INSTALL_DATA) $< $@ + +$(PROJECT_INCLUDE): + @$(mkinstalldirs) $@ + +$(PROJECT_INCLUDE)/rtems: + @$(mkinstalldirs) $@ + +PREINSTALL_FILES = $(PROJECT_INCLUDE) + +include_rtemsdir = $(includedir)/rtems +include_rtems_HEADERS = include/rtems/bspIo.h include/rtems/userenv.h \ + include/rtems/fs.h include/rtems/stdint.h + +PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ + $(include_rtems_HEADERS:include/%.h=$(PROJECT_INCLUDE)/%.h) + +all-local: $(PREINSTALL_FILES) + AUTOMAKE_FILES = automake/compile.am automake/lib.am automake/local.am \ automake/multilib.am automake/subdirs.am EXTRA_DIST = $(AUTOMAKE_FILES) diff --git a/cpukit/configure.ac b/cpukit/configure.ac index a40727f806..1dab22c307 100644 --- a/cpukit/configure.ac +++ b/cpukit/configure.ac @@ -227,7 +227,6 @@ AM_CONDITIONAL([LIBSERDBG],[test x"$rtems_cv_cc_attribute_weak" = x"yes"]) # Explicitly list all Makefiles here AC_CONFIG_FILES([ Makefile -include/Makefile ada/Makefile rtems/Makefile sapi/Makefile @@ -246,7 +245,6 @@ libnetworking/lib/Makefile libnetworking/libc/Makefile libnetworking/wrapup/Makefile librpc/Makefile -librpc/include/Makefile librpc/src/Makefile librpc/src/xdr/Makefile librpc/src/rpc/Makefile diff --git a/cpukit/include/Makefile.am b/cpukit/include/Makefile.am deleted file mode 100644 index ddb913991a..0000000000 --- a/cpukit/include/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -## -## $Id$ -## - - -$(PROJECT_INCLUDE)/%.h: %.h - $(INSTALL_DATA) $< $@ - -$(PROJECT_INCLUDE): - @$(mkinstalldirs) $@ - -$(PROJECT_INCLUDE)/rtems: - @$(mkinstalldirs) $@ - -PREINSTALL_FILES = $(PROJECT_INCLUDE) \ - $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) - -include_rtemsdir = $(includedir)/rtems -include_rtems_HEADERS = rtems/bspIo.h rtems/userenv.h rtems/fs.h \ - rtems/stdint.h - -PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \ - $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%) - -all-local: $(PREINSTALL_FILES) - -include $(top_srcdir)/automake/local.am -- cgit v1.2.3