From 4bf1801d0d6fa7bcf7488f7f3cc5c39fafeac7d2 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Thu, 3 Feb 2000 13:21:38 +0000 Subject: Patches rtems-rc-20000118-7.diff from Ralf Corsepius 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/rtems_servers/Makefile.am | 31 +++++++++++++++ c/src/libnetworking/rtems_servers/Makefile.in | 57 --------------------------- 2 files changed, 31 insertions(+), 57 deletions(-) create mode 100644 c/src/libnetworking/rtems_servers/Makefile.am delete mode 100644 c/src/libnetworking/rtems_servers/Makefile.in (limited to 'c/src/libnetworking/rtems_servers') diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am new file mode 100644 index 0000000000..77d1677844 --- /dev/null +++ b/c/src/libnetworking/rtems_servers/Makefile.am @@ -0,0 +1,31 @@ +## +## $Id$ +## + +AUTOMAKE_OPTIONS = foreign 1.4 + +LIBNAME = lib.a +LIB = $(ARCH)/$(LIBNAME) + +C_FILES = ftpd.c +C_O_FILES = $(C_FILES:%.c=$(ARCH)/%.o) + +OBJS = $(C_O_FILES) + +include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg +include $(top_srcdir)/../../../automake/lib.am + +# +# Add local stuff here using += +# + +$(LIB): $(OBJS) + $(make-library) + +all-local: $(ARCH) $(OBJS) $(LIB) + +.PRECIOUS: $(LIB) + +EXTRA_DIST = ftpd.c ftpd.h + +include $(top_srcdir)/../../../automake/local.am diff --git a/c/src/libnetworking/rtems_servers/Makefile.in b/c/src/libnetworking/rtems_servers/Makefile.in deleted file mode 100644 index 0af144e465..0000000000 --- a/c/src/libnetworking/rtems_servers/Makefile.in +++ /dev/null @@ -1,57 +0,0 @@ -# -# $Id$ -# - -@SET_MAKE@ -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -top_builddir = .. -subdir = rtems_servers - -RTEMS_ROOT = @RTEMS_ROOT@ -PROJECT_ROOT = @PROJECT_ROOT@ - -VPATH = @srcdir@ - -LIBNAME = lib.a -LIB = ${ARCH}/${LIBNAME} - -# C and C++ source names, if any, go here -- minus the .c or .cc -C_PIECES = ftpd -C_FILES = $(C_PIECES:%=%.c) -C_O_FILES = $(C_PIECES:%=${ARCH}/%.o) - -SRCS = $(C_FILES) -OBJS = $(C_O_FILES) - -include $(RTEMS_ROOT)/make/custom/@RTEMS_BSP@.cfg -include $(RTEMS_ROOT)/make/lib.cfg - -INSTALL_CHANGE = @INSTALL_CHANGE@ - -# -# Add local stuff here using += -# - -DEFINES += -CPPFLAGS += -CFLAGS += - -# -# 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 += $(LIB) -CLOBBER_ADDITIONS += - -all: ${ARCH} $(LIB) - -$(LIB): $(SRCS) ${OBJS} - $(make-library) - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -- cgit v1.2.3