From 13482e5dcfe9029a46825232b0a7d116af08ad1b Mon Sep 17 00:00:00 2001
From: Ralf Corsepius <ralf.corsepius@rtems.org>
Date: Tue, 8 Jul 2003 13:46:51 +0000
Subject: 2003-07-08	Ralf Corsepius <corsepiu@faw.uni-ulm.de>

	* configure.ac: Remove (Merged-in into ../configure.ac)
	* Makefile.am:
	Reflect having merged configure.ac into ../configure.ac.
	* src/config.h: New.
---
 cpukit/itron/Makefile.am | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'cpukit/itron/Makefile.am')

diff --git a/cpukit/itron/Makefile.am b/cpukit/itron/Makefile.am
index 556175d6d0..e53f6d0748 100644
--- a/cpukit/itron/Makefile.am
+++ b/cpukit/itron/Makefile.am
@@ -2,11 +2,11 @@
 ## $Id$
 ##
 
-ACLOCAL_AMFLAGS = -I ../aclocal
+include $(top_srcdir)/automake/multilib.am
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
 
-include $(top_srcdir)/../automake/multilib.am
-include $(top_srcdir)/../automake/compile.am
-include $(top_srcdir)/../automake/lib.am
+EXTRA_DIST =
 
 $(PROJECT_INCLUDE):
 	@$(mkinstalldirs) $@
@@ -20,8 +20,12 @@ $(PROJECT_INCLUDE)/%.h: include/%.h
 $(PROJECT_INCLUDE)/%.inl: $(INLINEdir)/%.inl
 	$(INSTALL_DATA) $< $@
 
+if HAS_ITRON
 ## include
 
+noinst_HEADERS =
+noinst_HEADERS += src/config.h
+
 include_HEADERS = include/itron.h
 
 PREINSTALL_FILES = $(PROJECT_INCLUDE)
@@ -39,7 +43,7 @@ include_itronsys_HEADERS = include/itronsys/eventflags.h include/itronsys/fmempo
 PREINSTALL_FILES += $(PROJECT_INCLUDE)/itronsys \
     $(include_itronsys_HEADERS:include/%=$(PROJECT_INCLUDE)/%)
 
-EXTRA_DIST = include/itronsys/README
+EXTRA_DIST += include/itronsys/README
 
 ## rtems/itron
 include_rtems_itrondir = $(includedir)/rtems/itron
@@ -63,7 +67,7 @@ inline_H_FILES = inline/rtems/itron/eventflags.inl \
     inline/rtems/itron/msgbuffer.inl inline/rtems/itron/network.inl inline/rtems/itron/port.inl \
     inline/rtems/itron/semaphore.inl inline/rtems/itron/sysmgmt.inl inline/rtems/itron/task.inl \
     inline/rtems/itron/time.inl inline/rtems/itron/vmempool.inl
-noinst_HEADERS = $(inline_H_FILES)
+noinst_HEADERS += $(inline_H_FILES)
 
 if INLINE
 PREINSTALL_FILES += $(inline_H_FILES:inline/%=$(PROJECT_INCLUDE)/%)
@@ -127,10 +131,13 @@ C_FILES = $(TASK_C_FILES) $(TASKSYNC_C_FILES) $(SEMAPHORE_C_FILES) \
     $(TIME_C_FILES)
 OBJS = $(C_FILES:src/%.c=${ARCH}/%.$(OBJEXT))
 
-AM_CPPFLAGS += -Isrc  -D__RTEMS_INSIDE__
+AM_CPPFLAGS += -I$(srcdir)/src  -D__RTEMS_INSIDE__
+
+all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB}
 
 $(LIB): ${OBJS}
 	$(make-library)
+endif
 
 ${ARCH}/%.$(OBJEXT): src/%.c
 	${COMPILE} -o $@ -c $<
@@ -140,7 +147,4 @@ UNUSED_C_FILES = src/cre_mbx.c src/del_mbx.c src/mboxtranslatereturncode.c src/n
 
 EXTRA_DIST += $(C_FILES) $(UNUSED_C_FILES) src/TODO
 
-## General
-all-local: $(PREINSTALL_FILES) ${ARCH} ${LIB}
-
-include $(top_srcdir)/../automake/local.am
+include $(top_srcdir)/automake/local.am
-- 
cgit v1.2.3