2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* Makefile.am: Merge-in include/Makefile.am.
	* include/Makefile.am: Remove.
	* configure.ac: Reflect changes above.
This commit is contained in:
Ralf Corsepius
2002-06-18 12:36:40 +00:00
parent 75fb648b95
commit 9909f34c49
7 changed files with 50 additions and 26 deletions

View File

@@ -1,3 +1,9 @@
2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am: Include $(top_srcdir)/../automake/*.am.

View File

@@ -4,7 +4,25 @@
ACLOCAL_AMFLAGS = -I ../aclocal
SUBDIRS = include src
SUBDIRS = src
include_rtemsdir = $(includedir)/rtems
$(PROJECT_INCLUDE)/%.h: include/%.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
include_rtems_HEADERS = \
include/rtems/bdbuf.h include/rtems/blkdev.h \
include/rtems/diskdevs.h include/rtems/ramdisk.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = README

View File

@@ -24,7 +24,6 @@ RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile
src/Makefile
])
AC_OUTPUT

View File

@@ -1,22 +0,0 @@
##
## $Id$
##
include_rtemsdir = $(includedir)/rtems
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
include_rtems_HEADERS = \
rtems/bdbuf.h rtems/blkdev.h rtems/diskdevs.h rtems/ramdisk.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../automake/local.am

View File

@@ -1,3 +1,9 @@
2002-06-18 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Merge-in include/Makefile.am.
* include/Makefile.am: Remove.
* configure.ac: Reflect changes above.
2002-06-17 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am: Include $(top_srcdir)/../automake/*.am.

View File

@@ -4,7 +4,25 @@
ACLOCAL_AMFLAGS = -I ../aclocal
SUBDIRS = include src
SUBDIRS = src
include_rtemsdir = $(includedir)/rtems
$(PROJECT_INCLUDE)/%.h: include/%.h
$(INSTALL_DATA) $< $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
include_rtems_HEADERS = \
include/rtems/bdbuf.h include/rtems/blkdev.h \
include/rtems/diskdevs.h include/rtems/ramdisk.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = README

View File

@@ -24,7 +24,6 @@ RTEMS_PROJECT_ROOT
# Explicitly list all Makefiles here
AC_CONFIG_FILES([Makefile
include/Makefile
src/Makefile
])
AC_OUTPUT