summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-07-25 06:15:38 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-07-25 06:15:38 +0000
commit4078e82ae544f8eec4fcfa05aeb1bf38e3c40099 (patch)
tree6a0bb0d4328f968ebb772749af25426d39a8556a
parentff393f2c850858ecb04b883aa1ce637ccdb51636 (diff)
downloadrtems-4078e82ae544f8eec4fcfa05aeb1bf38e3c40099.tar.bz2
2003-07-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../configure.ac). * .cvsignore, Makefile.am, pppd/Makefile.am, rtems_servers/Makefile.am, rtems_telnetd/Makefile.am, rtems_webserver/Makefile.am, wrapup/Makefile.am: Reflect having merged configure.ac into ../configure.ac
Diffstat (limited to '')
-rw-r--r--c/src/libnetworking/.cvsignore12
-rw-r--r--c/src/libnetworking/ChangeLog8
-rw-r--r--c/src/libnetworking/Makefile.am6
-rw-r--r--c/src/libnetworking/configure.ac43
-rw-r--r--c/src/libnetworking/pppd/Makefile.am13
-rw-r--r--c/src/libnetworking/rtems_servers/Makefile.am24
-rw-r--r--c/src/libnetworking/rtems_telnetd/Makefile.am13
-rw-r--r--c/src/libnetworking/rtems_webserver/Makefile.am12
-rw-r--r--c/src/libnetworking/wrapup/Makefile.am8
-rw-r--r--cpukit/ftpd/Makefile.am24
-rw-r--r--cpukit/httpd/Makefile.am12
-rw-r--r--cpukit/pppd/Makefile.am13
-rw-r--r--cpukit/telnetd/Makefile.am13
13 files changed, 85 insertions, 116 deletions
diff --git a/c/src/libnetworking/.cvsignore b/c/src/libnetworking/.cvsignore
index bfdfd995be..282522db03 100644
--- a/c/src/libnetworking/.cvsignore
+++ b/c/src/libnetworking/.cvsignore
@@ -1,14 +1,2 @@
-aclocal.m4
-autom4te*.cache
-config.cache
-config.guess
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
Makefile
Makefile.in
-missing
-mkinstalldirs
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index 551c7bb813..4ba67fcfa4 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * configure.ac: Remove (Merged into ../configure.ac).
+ * .cvsignore, Makefile.am, pppd/Makefile.am,
+ rtems_servers/Makefile.am, rtems_telnetd/Makefile.am,
+ rtems_webserver/Makefile.am, wrapup/Makefile.am:
+ Reflect having merged configure.ac into ../configure.ac
+
2003-06-13 Joel Sherrill <joel@OARcorp.com>
* pppd/chat.c: Removed warnings.
diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am
index b52e9870a5..f5acda9411 100644
--- a/c/src/libnetworking/Makefile.am
+++ b/c/src/libnetworking/Makefile.am
@@ -2,9 +2,7 @@
## $Id$
##
-ACLOCAL_AMFLAGS = -I ../../../aclocal
-
SUBDIRS = rtems_servers pppd rtems_telnetd rtems_webserver wrapup
-include $(top_srcdir)/../../../automake/subdirs.am
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/subdirs.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libnetworking/configure.ac b/c/src/libnetworking/configure.ac
deleted file mode 100644
index 1bdd17aa39..0000000000
--- a/c/src/libnetworking/configure.ac
+++ /dev/null
@@ -1,43 +0,0 @@
-## Process this file with autoconf to produce a configure script.
-##
-## $Id$
-
-AC_PREREQ(2.57)
-AC_INIT([rtems-c-src-libnetworking],[_RTEMS_VERSION],[rtems-bugs@OARcorp.com])
-AC_CONFIG_SRCDIR([pppd])
-RTEMS_TOP(../../..)
-
-RTEMS_CANONICAL_TARGET_CPU
-
-AM_INIT_AUTOMAKE([no-define foreign 1.7.2])
-AM_MAINTAINER_MODE
-
-RTEMS_ENABLE_NETWORKING
-RTEMS_ENABLE_BARE
-RTEMS_ENABLE_POSIX
-
-RTEMS_ENV_RTEMSBSP
-
-RTEMS_CHECK_CPU
-RTEMS_CANONICAL_HOST
-
-RTEMS_PROJECT_ROOT
-
-RTEMS_PROG_CC_FOR_TARGET
-RTEMS_CANONICALIZE_TOOLS
-
-RTEMS_CHECK_CUSTOM_BSP(RTEMS_BSP)
-RTEMS_CHECK_NETWORKING(RTEMS_BSP)
-RTEMS_CHECK_POSIX_API(RTEMS_BSP)
-
-AM_CONDITIONAL(HAS_POSIX,test "$HAS_POSIX_API" = "yes")
-
-# Explicitly list all Makefiles here
-AC_CONFIG_FILES([Makefile
-pppd/Makefile
-rtems_servers/Makefile
-rtems_telnetd/Makefile
-rtems_webserver/Makefile
-wrapup/Makefile
-])
-AC_OUTPUT
diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am
index b77fe30e4a..f03c0d604f 100644
--- a/c/src/libnetworking/pppd/Makefile.am
+++ b/c/src/libnetworking/pppd/Makefile.am
@@ -10,17 +10,21 @@ C_FILES = auth.c ccp.c chap.c chap_ms.c chat.c demand.c fsm.c ipcp.c lcp.c \
rtemspppd.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# Add local stuff here using +=
#
+if HAS_NETWORKING
+include_HEADERS = rtemspppd.h rtemsdialer.h
+
$(LIB): $(OBJS)
$(make-library)
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
@@ -30,12 +34,9 @@ lcp.c lcp.h magic.c magic.h md4.c md4.h md5.c md5.h options.c \
patchlevel.h pathnames.h pppd.h rtemsdialer.h rtemsmain.c rtemspppd.c \
rtemspppd.h sys-rtems.c upap.c upap.h utils.c
-include_HEADERS = rtemspppd.h rtemsdialer.h
-
-
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libnetworking/rtems_servers/Makefile.am b/c/src/libnetworking/rtems_servers/Makefile.am
index 9748f0af2c..e53b6728ab 100644
--- a/c/src/libnetworking/rtems_servers/Makefile.am
+++ b/c/src/libnetworking/rtems_servers/Makefile.am
@@ -2,34 +2,36 @@
## $Id$
##
-include_rtemsdir = $(includedir)/rtems
-
LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME)
C_FILES = ftpd.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# Add local stuff here using +=
#
+EXTRA_DIST = ftpd.c ftpd.h
+
+if HAS_NETWORKING
+include_rtemsdir = $(includedir)/rtems
+
+include_HEADERS = ftpd.h
+
+include_rtems_HEADERS =
+
$(LIB): $(OBJS)
$(make-library)
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
-EXTRA_DIST = ftpd.c ftpd.h
-
-include_HEADERS = ftpd.h
-
-include_rtems_HEADERS =
-
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
@@ -41,4 +43,4 @@ $(PROJECT_INCLUDE)/rtems:
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libnetworking/rtems_telnetd/Makefile.am b/c/src/libnetworking/rtems_telnetd/Makefile.am
index d03d4272d5..26d5b24071 100644
--- a/c/src/libnetworking/rtems_telnetd/Makefile.am
+++ b/c/src/libnetworking/rtems_telnetd/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-include_rtemsdir = $(includedir)/rtems
LIBNAME = libtelnetd-tmp
LIB = $(ARCH)/$(LIBNAME).a
@@ -10,10 +9,9 @@ LIB = $(ARCH)/$(LIBNAME).a
C_FILES = pty.c telnetd.c icmds.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include_rtems_HEADERS = pty.h telnetd.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
@@ -24,6 +22,10 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
+if HAS_NETWORKING
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = pty.h telnetd.h
+
$(LIB): $(OBJS)
$(make-library)
@@ -31,9 +33,10 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
EXTRA_DIST = README pty.c telnetd.c pty.h icmds.c telnetd.h
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libnetworking/rtems_webserver/Makefile.am b/c/src/libnetworking/rtems_webserver/Makefile.am
index 7d84302064..f5a8e73122 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -2,8 +2,6 @@
## $Id$
##
-include_goaheaddir = $(includedir)/goahead
-
LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME)
@@ -15,8 +13,8 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
H_FILES = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h wsIntrn.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# Add local stuff here using +=
@@ -42,12 +40,16 @@ $(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems_webserver.h \
$(PROJECT_INCLUDE)/goahead $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h)
+if HAS_NETWORKING
if HAS_POSIX
+include_goaheaddir = $(includedir)/goahead
+
include_HEADERS = rtems_webserver.h
include_goahead_HEADERS = $(H_FILES)
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
endif
+endif
.PRECIOUS: $(LIB)
@@ -56,4 +58,4 @@ EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \
sock.c socket.c sym.c uemf.c uemf.h um.h url.c value.c wbase64.c webcomp.c \
webmain.c webpage.c webrom.c webs.c webs.h websuemf.c wsIntrn.h
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am
index 712033e552..3b839ba14f 100644
--- a/c/src/libnetworking/wrapup/Makefile.am
+++ b/c/src/libnetworking/wrapup/Makefile.am
@@ -12,16 +12,18 @@ NET_O_PIECES = rtems_servers \
OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libnetapps.a
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# (OPTIONAL) Add local stuff here using +=
#
+if HAS_NETWORKING
$(LIB): $(OBJS)
$(make-library)
all-local: $(ARCH) $(OBJS) $(LIB)
+endif
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/cpukit/ftpd/Makefile.am b/cpukit/ftpd/Makefile.am
index 9748f0af2c..e53b6728ab 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -2,34 +2,36 @@
## $Id$
##
-include_rtemsdir = $(includedir)/rtems
-
LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME)
C_FILES = ftpd.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# Add local stuff here using +=
#
+EXTRA_DIST = ftpd.c ftpd.h
+
+if HAS_NETWORKING
+include_rtemsdir = $(includedir)/rtems
+
+include_HEADERS = ftpd.h
+
+include_rtems_HEADERS =
+
$(LIB): $(OBJS)
$(make-library)
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
-EXTRA_DIST = ftpd.c ftpd.h
-
-include_HEADERS = ftpd.h
-
-include_rtems_HEADERS =
-
PREINSTALL_FILES = $(PROJECT_INCLUDE) \
$(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
@@ -41,4 +43,4 @@ $(PROJECT_INCLUDE)/rtems:
$(PROJECT_INCLUDE)/rtems/%.h: %.h
$(INSTALL_DATA) $< $@
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/cpukit/httpd/Makefile.am b/cpukit/httpd/Makefile.am
index 7d84302064..f5a8e73122 100644
--- a/cpukit/httpd/Makefile.am
+++ b/cpukit/httpd/Makefile.am
@@ -2,8 +2,6 @@
## $Id$
##
-include_goaheaddir = $(includedir)/goahead
-
LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME)
@@ -15,8 +13,8 @@ OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
H_FILES = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h wsIntrn.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# Add local stuff here using +=
@@ -42,12 +40,16 @@ $(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(PROJECT_INCLUDE)/rtems_webserver.h \
$(PROJECT_INCLUDE)/goahead $(H_FILES:%.h=$(PROJECT_INCLUDE)/goahead/%.h)
+if HAS_NETWORKING
if HAS_POSIX
+include_goaheaddir = $(includedir)/goahead
+
include_HEADERS = rtems_webserver.h
include_goahead_HEADERS = $(H_FILES)
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
endif
+endif
.PRECIOUS: $(LIB)
@@ -56,4 +58,4 @@ EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \
sock.c socket.c sym.c uemf.c uemf.h um.h url.c value.c wbase64.c webcomp.c \
webmain.c webpage.c webrom.c webs.c webs.h websuemf.c wsIntrn.h
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/cpukit/pppd/Makefile.am b/cpukit/pppd/Makefile.am
index b77fe30e4a..f03c0d604f 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -10,17 +10,21 @@ C_FILES = auth.c ccp.c chap.c chap_ms.c chat.c demand.c fsm.c ipcp.c lcp.c \
rtemspppd.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
#
# Add local stuff here using +=
#
+if HAS_NETWORKING
+include_HEADERS = rtemspppd.h rtemsdialer.h
+
$(LIB): $(OBJS)
$(make-library)
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
@@ -30,12 +34,9 @@ lcp.c lcp.h magic.c magic.h md4.c md4.h md5.c md5.h options.c \
patchlevel.h pathnames.h pppd.h rtemsdialer.h rtemsmain.c rtemspppd.c \
rtemspppd.h sys-rtems.c upap.c upap.h utils.c
-include_HEADERS = rtemspppd.h rtemsdialer.h
-
-
PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
$(PROJECT_INCLUDE)/%.h: %.h
$(INSTALL_DATA) $< $@
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am
diff --git a/cpukit/telnetd/Makefile.am b/cpukit/telnetd/Makefile.am
index d03d4272d5..26d5b24071 100644
--- a/cpukit/telnetd/Makefile.am
+++ b/cpukit/telnetd/Makefile.am
@@ -2,7 +2,6 @@
## $Id$
##
-include_rtemsdir = $(includedir)/rtems
LIBNAME = libtelnetd-tmp
LIB = $(ARCH)/$(LIBNAME).a
@@ -10,10 +9,9 @@ LIB = $(ARCH)/$(LIBNAME).a
C_FILES = pty.c telnetd.c icmds.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-include_rtems_HEADERS = pty.h telnetd.h
-include $(top_srcdir)/../../../automake/compile.am
-include $(top_srcdir)/../../../automake/lib.am
+include $(top_srcdir)/../../automake/compile.am
+include $(top_srcdir)/../../automake/lib.am
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
@@ -24,6 +22,10 @@ $(PROJECT_INCLUDE)/rtems/%.h: %.h
# (OPTIONAL) Add local stuff here using +=
#
+if HAS_NETWORKING
+include_rtemsdir = $(includedir)/rtems
+include_rtems_HEADERS = pty.h telnetd.h
+
$(LIB): $(OBJS)
$(make-library)
@@ -31,9 +33,10 @@ PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
$(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
+endif
.PRECIOUS: $(LIB)
EXTRA_DIST = README pty.c telnetd.c pty.h icmds.c telnetd.h
-include $(top_srcdir)/../../../automake/local.am
+include $(top_srcdir)/../../automake/local.am