2003-09-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merge-in include/Makefile.am.
	* include/Makefile.am: Remove.
	* configure.ac: Reflect having removed include/Makefile.am and
	librpc/include/Makefile.am.
This commit is contained in:
Ralf Corsepius
2003-09-24 08:11:33 +00:00
parent 2783df063e
commit 71e66df3ce
4 changed files with 28 additions and 30 deletions

View File

@@ -1,3 +1,10 @@
2003-09-24 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* 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 <joel@OARcorp.com>
* include/rtems/bspIo.h, include/rtems/fs.h, include/rtems/userenv.h:

View File

@@ -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)

View File

@@ -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

View File

@@ -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