From 4bf1801d0d6fa7bcf7488f7f3cc5c39fafeac7d2 Mon Sep 17 00:00:00 2001
From: Joel Sherrill <joel.sherrill@OARcorp.com>
Date: Thu, 3 Feb 2000 13:21:38 +0000
Subject: Patches rtems-rc-20000118-7.diff from Ralf Corsepius
 <corsepiu@faw.uni-ulm.de> that contains the automake files for libnetworking
 plus a couple of minor fixes.  [Now only one unused/unsupported Makefile.in
 remains (./c/src/lib/libbsp/hppa1.1/pxfl/Makefile.in).]

    To apply:
        patch -p1 < rtems-rc-20000118-7.diff
        /bin/sh rtems-rc-20000118-7.rm
        /bin/sh rtems-rc-20000118-7.add
        ./bootstrap

    Notes:
    * I have tested this one by building all BSPs for m68k, powerpc, sh and
      unix with toolchains built since last weekend.
    * I did not touch libnetworking's directory layout.
---
 c/src/libnetworking/wrapup/Makefile.am | 35 +++++++++++++++++++
 c/src/libnetworking/wrapup/Makefile.in | 62 ----------------------------------
 2 files changed, 35 insertions(+), 62 deletions(-)
 create mode 100644 c/src/libnetworking/wrapup/Makefile.am
 delete mode 100644 c/src/libnetworking/wrapup/Makefile.in

(limited to 'c/src/libnetworking/wrapup')

diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am
new file mode 100644
index 0000000000..5d2a73a05e
--- /dev/null
+++ b/c/src/libnetworking/wrapup/Makefile.am
@@ -0,0 +1,35 @@
+## 
+## $Id$
+## 
+
+AUTOMAKE_OPTIONS = foreign 1.4
+
+if HAS_POSIX
+POSIX_PIECES = rtems_webserver
+endif 
+
+NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers pppd \
+    $(POSIX_PIECES)
+OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
+LIB = $(ARCH)/libnetworking.a
+
+include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
+include $(top_srcdir)/../../../automake/lib.am
+
+#
+# (OPTIONAL) Add local stuff here using +=
+#
+
+$(LIB): $(OBJS)
+	$(make-library)
+
+$(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a: $(LIB)
+	$(INSTALL_DATA) $< $@
+
+TMPINSTALL_FILES += $(PROJECT_RELEASE)/lib/libnetworking$(LIB_VARIANT).a
+
+all-local: $(ARCH) $(OBJS) $(LIB) $(TMPINSTALL_FILES)
+
+.PRECIOUS: $(LIB)
+
+include $(top_srcdir)/../../../automake/local.am
diff --git a/c/src/libnetworking/wrapup/Makefile.in b/c/src/libnetworking/wrapup/Makefile.in
deleted file mode 100644
index ede2dcbfea..0000000000
--- a/c/src/libnetworking/wrapup/Makefile.in
+++ /dev/null
@@ -1,62 +0,0 @@
-#
-#  $Id$
-#
-
-@SET_MAKE@
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-top_builddir = ..
-subdir = wrapup
-
-RTEMS_ROOT = @RTEMS_ROOT@
-PROJECT_ROOT = @PROJECT_ROOT@
-
-VPATH = @srcdir@
-
-NET_O_PIECES = kern lib libc net netinet nfs rtems rtems_servers \
-    pppd $(POSIX_PIECES)
-OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.o)
-LIB = $(ARCH)/libnetworking.a
-
-include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg
-include $(RTEMS_ROOT)/make/lib.cfg
-
-INSTALL_CHANGE = @INSTALL_CHANGE@
-
-HAS_POSIX_API = @HAS_POSIX_API@
-
-ifeq ($(HAS_POSIX),yes)
-POSIX_PIECES = rtems_webserver
-endif 
-
-#
-# (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)
-
-all: ${ARCH} $(SRCS) $(LIB)
-	$(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