summaryrefslogtreecommitdiffstats
path: root/c/src
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-12-01 08:43:12 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-12-01 08:43:12 +0000
commit7406623261c51b1b013f6f2562ab763f114584a9 (patch)
treee810e332e4059c34591d051d70e8f10080eb05e9 /c/src
parent2003-12-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de> (diff)
downloadrtems-7406623261c51b1b013f6f2562ab763f114584a9.tar.bz2
2003-12-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reformat. Apply dirstamps to preinstallation. * pppd/Makefile.am: Ditto. * rtems_servers/Makefile.am: Ditto. * rtems_telnetd/Makefile.am: Ditto. * rtems_webserver/Makefile.am: Ditto. * wrapup/Makefile.am: Ditto.
Diffstat (limited to 'c/src')
-rw-r--r--c/src/libnetworking/ChangeLog9
-rw-r--r--c/src/libnetworking/Makefile.am2
-rw-r--r--c/src/libnetworking/pppd/Makefile.am28
-rw-r--r--c/src/libnetworking/rtems_servers/Makefile.am27
-rw-r--r--c/src/libnetworking/rtems_telnetd/Makefile.am27
-rw-r--r--c/src/libnetworking/rtems_webserver/Makefile.am83
-rw-r--r--c/src/libnetworking/wrapup/Makefile.am6
7 files changed, 128 insertions, 54 deletions
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index 12f86d66d3..c5dc6b73ff 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,12 @@
+2003-12-01 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ * Makefile.am: Reformat. Apply dirstamps to preinstallation.
+ * pppd/Makefile.am: Ditto.
+ * rtems_servers/Makefile.am: Ditto.
+ * rtems_telnetd/Makefile.am: Ditto.
+ * rtems_webserver/Makefile.am: Ditto.
+ * wrapup/Makefile.am: Ditto.
+
2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* Makefile.am: Reflect having moved automake/.
diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am
index 48ac66d518..6edea9be40 100644
--- a/c/src/libnetworking/Makefile.am
+++ b/c/src/libnetworking/Makefile.am
@@ -4,5 +4,7 @@
SUBDIRS = rtems_servers pppd rtems_telnetd rtems_webserver wrapup
+PREINSTALL_FILES =
+
include $(top_srcdir)/automake/subdirs.am
include $(top_srcdir)/automake/local.am
diff --git a/c/src/libnetworking/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am
index b3b8ba7a56..b0bf4ecd81 100644
--- a/c/src/libnetworking/pppd/Makefile.am
+++ b/c/src/libnetworking/pppd/Makefile.am
@@ -28,15 +28,27 @@ endif
.PRECIOUS: $(LIB)
-EXTRA_DIST = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h \
-chat.c demand.c fsm.c fsm.h ipcp.c ipcp.h ipxcp.c ipxcp.h \
-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
+EXTRA_DIST = auth.c ccp.c ccp.h chap.c chap.h chap_ms.c chap_ms.h chat.c \
+ demand.c fsm.c fsm.h ipcp.c ipcp.h ipxcp.c ipxcp.h 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
-PREINSTALL_FILES = $(PROJECT_INCLUDE) $(include_HEADERS:%=$(PROJECT_INCLUDE)/%)
+PREINSTALL_FILES =
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
+$(PROJECT_INCLUDE)/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)
+ @: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/rtemspppd.h: rtemspppd.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtemspppd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtemspppd.h
+
+$(PROJECT_INCLUDE)/rtemsdialer.h: rtemsdialer.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtemsdialer.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtemsdialer.h
+endif
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 967ff147b5..a98feff791 100644
--- a/c/src/libnetworking/rtems_servers/Makefile.am
+++ b/c/src/libnetworking/rtems_servers/Makefile.am
@@ -32,15 +32,22 @@ endif
.PRECIOUS: $(LIB)
-PREINSTALL_FILES = $(PROJECT_INCLUDE) \
- $(include_HEADERS:%=$(PROJECT_INCLUDE)/%) \
- $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
-
-$(PROJECT_INCLUDE)/%.h: %.h
- $(INSTALL_DATA) $< $@
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
- $(INSTALL_DATA) $< $@
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)
+ @: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
+ @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+
+$(PROJECT_INCLUDE)/ftpd.h: ftpd.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/ftpd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/ftpd.h
+endif
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 f433106a60..29dbfdc99e 100644
--- a/c/src/libnetworking/rtems_telnetd/Makefile.am
+++ b/c/src/libnetworking/rtems_telnetd/Makefile.am
@@ -2,22 +2,15 @@
## $Id$
##
-
LIBNAME = libtelnetd-tmp
LIB = $(ARCH)/$(LIBNAME).a
C_FILES = pty.c telnetd.c icmds.c
OBJS = $(C_FILES:%.c=$(ARCH)/%.$(OBJEXT))
-
include $(top_srcdir)/automake/compile.am
include $(top_srcdir)/automake/lib.am
-$(PROJECT_INCLUDE)/rtems:
- @$(mkinstalldirs) $@
-$(PROJECT_INCLUDE)/rtems/%.h: %.h
- $(INSTALL_DATA) $< $@
-
#
# (OPTIONAL) Add local stuff here using +=
#
@@ -29,9 +22,6 @@ include_rtems_HEADERS = pty.h telnetd.h
$(LIB): $(OBJS)
$(make-library)
-PREINSTALL_FILES = $(PROJECT_INCLUDE)/rtems \
- $(include_rtems_HEADERS:%=$(PROJECT_INCLUDE)/rtems/%)
-
all-local: $(ARCH) $(PREINSTALL_FILES) $(OBJS) $(LIB)
endif
@@ -39,4 +29,21 @@ endif
EXTRA_DIST = README pty.c telnetd.c pty.h icmds.c telnetd.h
+PREINSTALL_FILES =
+
+if HAS_NETWORKING
+$(PROJECT_INCLUDE)/rtems/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)/rtems
+ @: > $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems/pty.h: pty.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/pty.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/pty.h
+
+$(PROJECT_INCLUDE)/rtems/telnetd.h: telnetd.h $(PROJECT_INCLUDE)/rtems/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems/telnetd.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems/telnetd.h
+endif
+
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 592acb2a48..fa2b6027ab 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -5,14 +5,12 @@
LIBNAME = lib.a
LIB = $(ARCH)/$(LIBNAME)
-C_FILES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c form.c \
- h.c handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c \
- sock.c socket.c sym.c uemf.c um.c url.c value.c wbase64.c webrom.c webs.c \
+C_FILES = asp.c balloc.c default.c ejlex.c ejparse.c emfdb.c form.c h.c \
+ handler.c md5c.c mime.c misc.c webpage.c ringq.c rom.c security.c sock.c \
+ socket.c sym.c uemf.c um.c url.c value.c wbase64.c webrom.c webs.c \
websuemf.c webmain.c
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
@@ -25,27 +23,13 @@ AM_CPPFLAGS += -DWEBS -DUEMF -DOS="RTEMS"
$(LIB): $(OBJS)
$(make-library)
-$(PROJECT_INCLUDE):
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/goahead:
- $(mkinstalldirs) $@
-
-$(PROJECT_INCLUDE)/goahead/%.h: %.h
- $(INSTALL_DATA) $< $@
-
-$(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h
- $(INSTALL_DATA) $< $@
-
-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)
+include_goahead_HEADERS = ej.h ejIntrn.h emfdb.h md5.h uemf.h um.h webs.h \
+ wsIntrn.h
all-local: $(PREINSTALL_FILES) $(ARCH) $(OBJS) $(LIB)
endif
@@ -55,7 +39,60 @@ endif
EXTRA_DIST = asp.c balloc.c default.c ej.h ejlex.c ejparse.c form.c h.c \
handler.c mime.c misc.c ringq.c rom.c rtems_webserver.h security.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
+ 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
+
+PREINSTALL_FILES =
+
+$(PROJECT_INCLUDE)/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)
+ @: > $(PROJECT_INCLUDE)/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/$(dirstamp)
+
+if HAS_NETWORKING
+if HAS_POSIX
+$(PROJECT_INCLUDE)/goahead/$(dirstamp):
+ @$(mkinstalldirs) $(PROJECT_INCLUDE)/goahead
+ @: > $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+
+$(PROJECT_INCLUDE)/rtems_webserver.h: rtems_webserver.h $(PROJECT_INCLUDE)/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/rtems_webserver.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/rtems_webserver.h
+
+$(PROJECT_INCLUDE)/goahead/ej.h: ej.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/ej.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/ej.h
+
+$(PROJECT_INCLUDE)/goahead/ejIntrn.h: ejIntrn.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/ejIntrn.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/ejIntrn.h
+
+$(PROJECT_INCLUDE)/goahead/emfdb.h: emfdb.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/emfdb.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/emfdb.h
+
+$(PROJECT_INCLUDE)/goahead/md5.h: md5.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/md5.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/md5.h
+
+$(PROJECT_INCLUDE)/goahead/uemf.h: uemf.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/uemf.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/uemf.h
+
+$(PROJECT_INCLUDE)/goahead/um.h: um.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/um.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/um.h
+
+$(PROJECT_INCLUDE)/goahead/webs.h: webs.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/webs.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/webs.h
+
+$(PROJECT_INCLUDE)/goahead/wsIntrn.h: wsIntrn.h $(PROJECT_INCLUDE)/goahead/$(dirstamp)
+ $(INSTALL_DATA) $< $(PROJECT_INCLUDE)/goahead/wsIntrn.h
+PREINSTALL_FILES += $(PROJECT_INCLUDE)/goahead/wsIntrn.h
+endif
+endif
include $(top_srcdir)/automake/local.am
diff --git a/c/src/libnetworking/wrapup/Makefile.am b/c/src/libnetworking/wrapup/Makefile.am
index 83aa6d5080..e0cb8c4093 100644
--- a/c/src/libnetworking/wrapup/Makefile.am
+++ b/c/src/libnetworking/wrapup/Makefile.am
@@ -2,13 +2,11 @@
## $Id$
##
-
if HAS_POSIX
POSIX_PIECES = rtems_webserver
endif
-NET_O_PIECES = rtems_servers \
- rtems_telnetd pppd $(POSIX_PIECES)
+NET_O_PIECES = rtems_servers rtems_telnetd pppd $(POSIX_PIECES)
OBJS = $(foreach piece, $(NET_O_PIECES), ../$(piece)/$(ARCH)/*.$(OBJEXT))
LIB = $(ARCH)/libnetapps.a
@@ -26,4 +24,6 @@ $(LIB): $(OBJS)
all-local: $(ARCH) $(OBJS) $(LIB)
endif
+PREINSTALL_FILES =
+
include $(top_srcdir)/automake/local.am