2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* include/rtems/Makefile.am: Remove.
	* include/Makefile.am: Handle subdirs, require automake-1.5.
	* inline/rtems/Makefile.am: Remove.
	* inline/Makefile.am: Handle subdirs, require automake-1.5.
	* macros/rtems/Makefile.am: Remove.
	* Makefile.am: require automake-1.5.
This commit is contained in:
Joel Sherrill
2001-10-16 13:31:15 +00:00
parent ff61414ac8
commit a11e5d35cd
13 changed files with 126 additions and 103 deletions

View File

@@ -1,3 +1,12 @@
2001-10-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/rtems/Makefile.am: Remove.
* include/Makefile.am: Handle subdirs, require automake-1.5.
* inline/rtems/Makefile.am: Remove.
* inline/Makefile.am: Handle subdirs, require automake-1.5.
* macros/rtems/Makefile.am: Remove.
* Makefile.am: require automake-1.5.
2001-10-12 Joel Sherrill <joel@OARcorp.com>
* include/rtems/directives.h: Fixed typo.

View File

@@ -2,7 +2,7 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = include inline macros optman src

View File

@@ -2,21 +2,34 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
AUTOMAKE_OPTIONS = foreign 1.5
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
include_HEADERS = confdefs.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = rtems/config.h rtems/directives.h rtems/extension.h \
rtems/fatal.h rtems/init.h rtems/io.h rtems/mptables.h rtems/sptables.h
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
EXTRA_DIST = rtems/README
rtems/sptables.h: $(top_builddir)/config.status $(top_srcdir)/sapi/include/rtems/sptables.h.in
cd $(top_builddir) && CONFIG_FILES=sapi/include/$@ CONFIG_HEADERS= CONFIG_LINKS= $(SHELL) ./config.status
all-local: $(PREINSTALL_FILES)
SUBDIRS = rtems
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,24 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
include_rtems_HEADERS = config.h directives.h extension.h fatal.h init.h io.h mptables.h \
sptables.h
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
EXTRA_DIST = README
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

View File

@@ -2,9 +2,22 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems
include_rtemsdir = $(includedir)/rtems
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
if INLINE
include_rtems_HEADERS = rtems/extension.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,22 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
if INLINE
include_rtems_HEADERS = extension.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.inl: %.inl
$(INSTALL_DATA) $< $@
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/local.am

View File

@@ -2,9 +2,22 @@
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
AUTOMAKE_OPTIONS = foreign 1.5
SUBDIRS = rtems
include_rtemsdir = $(includedir)/rtems
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/%: %
$(INSTALL_DATA) $< $@
if MACROS
include_rtems_HEADERS = rtems/extension.inl
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/%)
endif
all-local: $(PREINSTALL_FILES)
include $(top_srcdir)/../../../automake/subdirs.am
include $(top_srcdir)/../../../automake/local.am

View File

@@ -1,27 +0,0 @@
##
## $Id$
##
AUTOMAKE_OPTIONS = foreign 1.4
include_rtemsdir = $(includedir)/rtems
I_FILES = extension.inl
if MACROS
include_rtems_HEADERS = $(I_FILES)
PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
$(PROJECT_INCLUDE)/rtems/%.inl: %.inl
$(INSTALL_DATA) $< $@
endif
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(I_FILES)
include $(top_srcdir)/../../../automake/local.am