summaryrefslogtreecommitdiffstats
path: root/cpukit/httpd
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 /cpukit/httpd
parent2003-07-24 Jennifer Averett <jennifer.averett@OARcorp.com> (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 'cpukit/httpd')
-rw-r--r--cpukit/httpd/Makefile.am12
1 files changed, 7 insertions, 5 deletions
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