summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Corsepius <ralf.corsepius@rtems.org>2003-08-16 12:12:10 +0000
committerRalf Corsepius <ralf.corsepius@rtems.org>2003-08-16 12:12:10 +0000
commit6a8e52d3aad0eb2f3c0058f31c24ae30f2aabf58 (patch)
tree9c30ba319f55d61e65f88964f52e1040df733e6c
parent11a26b990805fcfad7bc12c6813f19bddaa88f32 (diff)
downloadrtems-6a8e52d3aad0eb2f3c0058f31c24ae30f2aabf58.tar.bz2
2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
Makefile.am: Reflect having moved automake. pppd/Makefile.am: Reflect having moved automake. rtems_servers/Makefile.am: Reflect having moved automake. rtems_telnetd/Makefile.am: Reflect having moved automake. rtems_webserver/Makefile.am: Reflect having moved automake. wrapup/Makefile.am: Reflect having moved automake.
-rw-r--r--c/src/libnetworking/ChangeLog9
-rw-r--r--c/src/libnetworking/Makefile.am4
-rw-r--r--c/src/libnetworking/pppd/Makefile.am6
-rw-r--r--c/src/libnetworking/rtems_servers/Makefile.am6
-rw-r--r--c/src/libnetworking/rtems_telnetd/Makefile.am6
-rw-r--r--c/src/libnetworking/rtems_webserver/Makefile.am6
-rw-r--r--c/src/libnetworking/wrapup/Makefile.am6
-rw-r--r--cpukit/ftpd/Makefile.am6
-rw-r--r--cpukit/httpd/Makefile.am6
-rw-r--r--cpukit/pppd/Makefile.am6
-rw-r--r--cpukit/telnetd/Makefile.am6
11 files changed, 38 insertions, 29 deletions
diff --git a/c/src/libnetworking/ChangeLog b/c/src/libnetworking/ChangeLog
index 4ba67fcfa4..6a9ccbd5b5 100644
--- a/c/src/libnetworking/ChangeLog
+++ b/c/src/libnetworking/ChangeLog
@@ -1,3 +1,12 @@
+2003-08-16 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
+
+ Makefile.am: Reflect having moved automake.
+ pppd/Makefile.am: Reflect having moved automake.
+ rtems_servers/Makefile.am: Reflect having moved automake.
+ rtems_telnetd/Makefile.am: Reflect having moved automake.
+ rtems_webserver/Makefile.am: Reflect having moved automake.
+ wrapup/Makefile.am: Reflect having moved automake.
+
2003-07-25 Ralf Corsepius <corsepiu@faw.uni-ulm.de>
* configure.ac: Remove (Merged into ../configure.ac).
diff --git a/c/src/libnetworking/Makefile.am b/c/src/libnetworking/Makefile.am
index f5acda9411..48ac66d518 100644
--- a/c/src/libnetworking/Makefile.am
+++ b/c/src/libnetworking/Makefile.am
@@ -4,5 +4,5 @@
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/pppd/Makefile.am b/c/src/libnetworking/pppd/Makefile.am
index f03c0d604f..b3b8ba7a56 100644
--- a/c/src/libnetworking/pppd/Makefile.am
+++ b/c/src/libnetworking/pppd/Makefile.am
@@ -10,8 +10,8 @@ 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 +=
@@ -39,4 +39,4 @@ 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 e53b6728ab..967ff147b5 100644
--- a/c/src/libnetworking/rtems_servers/Makefile.am
+++ b/c/src/libnetworking/rtems_servers/Makefile.am
@@ -8,8 +8,8 @@ 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 +=
@@ -43,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 26d5b24071..f433106a60 100644
--- a/c/src/libnetworking/rtems_telnetd/Makefile.am
+++ b/c/src/libnetworking/rtems_telnetd/Makefile.am
@@ -10,8 +10,8 @@ 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
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
@@ -39,4 +39,4 @@ endif
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 f5a8e73122..592acb2a48 100644
--- a/c/src/libnetworking/rtems_webserver/Makefile.am
+++ b/c/src/libnetworking/rtems_webserver/Makefile.am
@@ -13,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 +=
@@ -58,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 3b839ba14f..83aa6d5080 100644
--- a/c/src/libnetworking/wrapup/Makefile.am
+++ b/c/src/libnetworking/wrapup/Makefile.am
@@ -12,8 +12,8 @@ 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 +=
@@ -26,4 +26,4 @@ $(LIB): $(OBJS)
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 e53b6728ab..967ff147b5 100644
--- a/cpukit/ftpd/Makefile.am
+++ b/cpukit/ftpd/Makefile.am
@@ -8,8 +8,8 @@ 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 +=
@@ -43,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 f5a8e73122..592acb2a48 100644
--- a/cpukit/httpd/Makefile.am
+++ b/cpukit/httpd/Makefile.am
@@ -13,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 +=
@@ -58,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 f03c0d604f..b3b8ba7a56 100644
--- a/cpukit/pppd/Makefile.am
+++ b/cpukit/pppd/Makefile.am
@@ -10,8 +10,8 @@ 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 +=
@@ -39,4 +39,4 @@ 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 26d5b24071..f433106a60 100644
--- a/cpukit/telnetd/Makefile.am
+++ b/cpukit/telnetd/Makefile.am
@@ -10,8 +10,8 @@ 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
+include $(top_srcdir)/automake/compile.am
+include $(top_srcdir)/automake/lib.am
$(PROJECT_INCLUDE)/rtems:
@$(mkinstalldirs) $@
@@ -39,4 +39,4 @@ endif
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