From fba12eb6ff4a91fcbac1c43dd3196114cc12756b Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Tue, 23 Nov 1999 13:29:04 +0000
Subject: Patch rtems-rc-19991117-11.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> to convert the libc directory to automake and
 "dozens of small fixes for Makefile.ins/configure.ins below c/src/lib."

---
 c/src/exec/wrapup/itron/Makefile.am | 36 +++++++++++++++++++++++
 c/src/exec/wrapup/itron/Makefile.in | 58 -------------------------------------
 2 files changed, 36 insertions(+), 58 deletions(-)
 create mode 100644 c/src/exec/wrapup/itron/Makefile.am
 delete mode 100644 c/src/exec/wrapup/itron/Makefile.in

(limited to 'c/src/exec/wrapup/itron')

diff --git a/c/src/exec/wrapup/itron/Makefile.am b/c/src/exec/wrapup/itron/Makefile.am
new file mode 100644
index 0000000000..58ceeb6d05
--- /dev/null
+++ b/c/src/exec/wrapup/itron/Makefile.am
@@ -0,0 +1,36 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+if HAS_ITRON
+LIBNAME = libitron
+LIB = $(ARCH)/$(LIBNAME).a
+endif
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+if HAS_ITRON
+
+ITRON_OBJS = $(wildcard ../../itron/src/$(ARCH)/*.o)
+
+OBJS = $(ITRON_OBJS)
+
+$(LIB): ${OBJS}
+	$(make-library)
+
+ITRON_LIB = \
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a
+
+$(PROJECT_RELEASE)/lib/$(LIBNAME)$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+all: ${ARCH} $(LIB) $(TMPINSTALL_FILES)
+
+endif
+
+TMPINSTALL_FILES += $(ITRON_LIB)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/exec/wrapup/itron/Makefile.in b/c/src/exec/wrapup/itron/Makefile.in
deleted file mode 100644
index eecd38fc21..0000000000
--- a/c/src/exec/wrapup/itron/Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../..
-subdir = wrapup/itron
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-ITRON_OBJS = $(wildcard ../../itron/src/$(ARCH)/*.o)
-
-OBJS = $(ITRON_OBJS)
-# HACK: AM_CONDITIONAL
-LIB = @HAS_ITRON_TRUE@$(ARCH)/libitron.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS +=
-
-LD_PATHS +=
-LD_LIBS +=
-LDFLAGS +=
-
-#
-# Add your list of files to delete here.  The config files
-#  already know how to delete some stuff, so you may want
-#  to just run 'make clean' first to see what gets missed.
-#  'make clobber' already includes 'make clean'
-#
-
-CLEAN_ADDITIONS +=
-CLOBBER_ADDITIONS +=
-
-$(LIB): ${OBJS}
-	$(make-library)
-
-# HACK: AM_CONDITIONAL
-all: @HAS_ITRON_TRUE@${ARCH} $(SRCS) $(LIB)
-@HAS_ITRON_TRUE@	@$(INSTALL_VARIANT) -m 644 $(LIB) $(PROJECT_RELEASE)/lib
-
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	 && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-- 
cgit v1.2.3