4 files changed, 35 insertions, 27 deletions
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