2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>

* include/Makefile.am, include/rtems/rtems/Makefile.am,
	inline/rtems/rtems/Makefile.am, macros/rtems/rtems/Makefile.am,
	rtems/optman/Makefile.am:
	Apply include_*HEADERS instead of H_FILES.
This commit is contained in:
Joel Sherrill
2001-02-05 18:32:04 +00:00
parent 890f07cb83
commit f0ab3fa51e
9 changed files with 36 additions and 23 deletions

View File

@@ -1,3 +1,10 @@
2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am, include/rtems/rtems/Makefile.am,
inline/rtems/rtems/Makefile.am, macros/rtems/rtems/Makefile.am,
rtems/optman/Makefile.am:
Apply include_*HEADERS instead of H_FILES.
2001-01-22 Michael Hamel <mhamel@adi.co.nz>
* include/rtems.h, src/signalcatch.c: Modifications to make

View File

@@ -4,12 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
H_FILES = rtems.h
noinst_HEADERS = $(H_FILES)
include_HEADERS = rtems.h
PREINSTALL_FILES += $(PROJECT_INCLUDE) \
$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@

View File

@@ -4,6 +4,8 @@
AUTOMAKE_OPTIONS = foreign 1.4
include_rtems_rtemsdir = $(includedir)/rtems/rtems
## We only build multiprocessing related files if HAS_MP was defined
MP_H_FILES = eventmp.h mp.h msgmp.h partmp.h regionmp.h semmp.h signalmp.h \
taskmp.h
@@ -13,15 +15,13 @@ STD_H_FILES = asr.h attr.h cache.h clock.h config.h dpmem.h event.h \
rtemsapi.h sem.h signal.h status.h support.h tasks.h timer.h types.h
if HAS_MP
H_FILES = $(STD_H_FILES) $(MP_H_FILES)
include_rtems_rtems_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
else
H_FILES = $(STD_H_FILES)
include_rtems_rtems_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
endif
noinst_HEADERS = $(STD_H_FILES) $(MP_H_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
$(H_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(PROJECT_INCLUDE)/rtems/rtems:
@$(mkinstalldirs) $@

View File

@@ -4,15 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
if INLINE
include_rtems_rtemsdir = $(includedir)/rtems/rtems
I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
modes.inl options.inl part.inl ratemon.inl region.inl sem.inl status.inl \
support.inl tasks.inl timer.inl
noinst_HEADERS = $(I_FILES)
if INLINE
include_rtems_rtems_HEADERS = $(I_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(PROJECT_INCLUDE)/rtems/rtems:
@$(mkinstalldirs) $@
@@ -22,4 +24,6 @@ endif
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(I_FILES)
include $(top_srcdir)/../../../automake/local.am

View File

@@ -4,16 +4,17 @@
AUTOMAKE_OPTIONS = foreign 1.4
include_rtems_rtemsdir = $(includedir)/rtems/rtems
I_FILES = asr.inl attr.inl dpmem.inl event.inl eventset.inl message.inl \
modes.inl options.inl part.inl ratemon.inl region.inl sem.inl status.inl \
support.inl tasks.inl timer.inl
noinst_HEADERS = $(I_FILES)
if MACROS
include_rtems_rtems_HEADERS = $(I_FILES)
PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/rtems \
$(I_FILES:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(include_rtems_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/rtems/%)
$(PROJECT_INCLUDE)/rtems/rtems:
@$(mkinstalldirs) $@
@@ -23,4 +24,6 @@ endif
all-local: $(PREINSTALL_FILES)
EXTRA_DIST = $(I_FILES)
include $(top_srcdir)/../../../automake/local.am

View File

@@ -24,8 +24,6 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
# (OPTIONAL) Add local stuff here using +=
#
ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS)

View File

@@ -24,8 +24,6 @@ $(PROJECT_RELEASE)/lib/%$(LIB_VARIANT).rel: $(ARCH)/%.rel
# (OPTIONAL) Add local stuff here using +=
#
ASM4FLAGS += -I$(PROJECT_INCLUDE)/rtems
all-local: ${ARCH} $(PGMS) $(TMPINSTALL_FILES)
.PRECIOUS: $(PGMS)

View File

@@ -1,3 +1,10 @@
2001-02-03 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* include/Makefile.am, include/rtems/rtems/Makefile.am,
inline/rtems/rtems/Makefile.am, macros/rtems/rtems/Makefile.am,
rtems/optman/Makefile.am:
Apply include_*HEADERS instead of H_FILES.
2001-01-22 Michael Hamel <mhamel@adi.co.nz>
* include/rtems.h, src/signalcatch.c: Modifications to make

View File

@@ -4,12 +4,10 @@
AUTOMAKE_OPTIONS = foreign 1.4
H_FILES = rtems.h
noinst_HEADERS = $(H_FILES)
include_HEADERS = rtems.h
PREINSTALL_FILES += $(PROJECT_INCLUDE) \
$(noinst_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE):
@$(mkinstalldirs) $@