From 49e05f41316997008b8af1bb76f6878532246f50 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Mon, 10 Jan 2000 14:03:32 +0000
Subject: Patch rtems-rc-20000104-4.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that converts the unix directory to automake.

Ralf's note:  Please check c/src/lib/libbsp/unix/posix/startup/Makefile.am.
I am not sure if it is correct.
---
 c/src/lib/libbsp/unix/posix/startup/Makefile.am | 61 +++++++++++++++++
 c/src/lib/libbsp/unix/posix/startup/Makefile.in | 91 -------------------------
 2 files changed, 61 insertions(+), 91 deletions(-)
 create mode 100644 c/src/lib/libbsp/unix/posix/startup/Makefile.am
 delete mode 100644 c/src/lib/libbsp/unix/posix/startup/Makefile.in

(limited to 'c/src/lib/libbsp/unix/posix/startup')

diff --git a/c/src/lib/libbsp/unix/posix/startup/Makefile.am b/c/src/lib/libbsp/unix/posix/startup/Makefile.am
new file mode 100644
index 0000000000..709696b55e
--- /dev/null
+++ b/c/src/lib/libbsp/unix/posix/startup/Makefile.am
@@ -0,0 +1,61 @@
+##
+##  $Id$
+##
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+PGM = ${ARCH}/startup.rel
+
+VPATH = @srcdir@:@srcdir@/../../../shared
+
+if HAS_CXX
+C_MAIN_C_FILES =
+else
+C_MAIN_C_FILES = main.c bootcard.c
+endif
+
+# C sources
+C_FILES = bspclean.c bsplibc.c bspstart.c setvec.c $(C_MAIN_C_FILES)
+C_O_FILES = $(C_FILES:%.c=${ARCH}/%.o)
+startup_rel_OBJECTS = $(C_O_FILES)
+
+# CC sources
+CC_FILES = rtems-ctor.cc
+CC_O_FILES = $(CC_FILES:%.cc=${ARCH}/%.o}
+
+# We install the RTEMS constructor as a separate .o
+# so it can be easily place correctly by the compiler config file.
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+AM_CFLAGS += $(LIBC_DEFINES)
+
+$(PGM): $(startup_rel_OBJECTS)
+	$(make-rel)
+
+${ARCH}/libno-ctor.a: $(ARCH)/no-ctor.o
+	$(AR) -cvr $@ $<
+
+$(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a: ${ARCH}/libno-ctor.a
+	$(INSTALL_DATA) $< $@
+
+$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o: $(ARCH)/rtems-ctor.o
+	$(INSTALL_DATA) $< $@
+
+if HAS_CXX
+all-local: $(ARCH) $(PGM) \
+	$(PROJECT_RELEASE)/lib/libno-ctor$(LIB_VARIANT).a \
+	$(PROJECT_RELEASE)/lib/rtems-ctor$(LIB_VARIANT).o
+else
+all-local: $(ARCH) $(PGM) 
+endif
+
+EXTRA_DIST = bspclean.c bspstart.c exit.c main.c no-ctor.c rtems-ctor.cc \
+   setvec.c
+
+include $(top_srcdir)/../../../../../../automake/local.am
diff --git a/c/src/lib/libbsp/unix/posix/startup/Makefile.in b/c/src/lib/libbsp/unix/posix/startup/Makefile.in
deleted file mode 100644
index a518d487cf..0000000000
--- a/c/src/lib/libbsp/unix/posix/startup/Makefile.in
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ../../..
-subdir = unix/posix/startup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@:@srcdir@/../../../shared
-
-PGM = ${ARCH}/startup.rel
-NO_CTOR_LIB = $(NO_CTOR_LIB_CPLUSPLUS_$(HAS_CPLUSPLUS)_V)
-
-# C source names, if any, go here -- minus the .c
-C_PIECES = bspclean bsplibc bspstart setvec $(C_MAIN_C_PIECES)
-C_FILES = $(C_PIECES:%=%.c)
-C_O_FILES = $(C_PIECES:%=${ARCH}/%.o)
-
-CC_PIECES = $(CXX_MAIN)
-CC_FILES = $(CC_PIECES:%=%.cc)
-CC_O_FILES = $(CC_PIECES:%=${ARCH}/%.o)
-
-H_FILES =
-
-SRCS = $(C_FILES) $(CC_FILES) $(H_FILES) no-ctor.c
-OBJS = $(C_O_FILES)
-
-# We install the RTEMS constructor as a separate .o
-# so it can be easily place correctly by the compiler config file.
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/leaf.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-NO_CTOR_LIB_CPLUSPLUS_yes_V = ${ARCH}/libno-ctor.a
-INSTALLED_O_FILES_CPLUSPLUS_yes_V = $(ARCH)/rtems-ctor.o
-CXX_MAIN_C_PIECES_CPLUSPLUS_yes_V = rtems-ctor
-C_MAIN_C_PIECES_CPLUSPLUS_yes_V =
-
-NO_CTOR_LIB_CPLUSPLUS_no_V =
-INSTALLED_O_FILES_CPLUSPLUS_no_V =
-CXX_MAIN_C_PIECES_CPLUSPLUS_no_V =
-C_MAIN_C_PIECES_CPLUSPLUS_no_V = main bootcard
-
-NO_CTOR_LIB = $(NO_CTOR_LIB_CPLUSPLUS_$(HAS_CPLUSPLUS)_V)
-INSTALLED_O_FILES = $(INSTALLED_O_FILES_CPLUSPLUS_$(HAS_CPLUSPLUS)_V)
-CXX_MAIN_C_PIECES = $(CXX_MAIN_C_PIECES_CPLUSPLUS_$(HAS_CPLUSPLUS)_V)
-C_MAIN_C_PIECES = $(C_MAIN_C_PIECES_CPLUSPLUS_$(HAS_CPLUSPLUS)_V)
-
-#
-# (OPTIONAL) Add local stuff here using +=
-#
-
-DEFINES +=
-CPPFLAGS +=
-CFLAGS += $(LIBC_DEFINES)
-
-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 +=
-
-$(PGM): ${OBJS}
-	$(make-rel)
-
-${NO_CTOR_LIB}: $(ARCH)/no-ctor.o
-	$(RM) $@
-	$(AR) -cvr $@ $(ARCH)/no-ctor.o
-
-all: ${ARCH} $(SRCS) $(INSTALLED_O_FILES) $(PGM) ${NO_CTOR_LIB}
-	@$(INSTALL_VARIANT) $(INSTALLED_O_FILES) $(PROJECT_RELEASE)/lib
-	@$(INSTALL_VARIANT) $(NO_CTOR_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