-SUBDIRS = ap lib main modules os support
+SUBDIRS = srclib modules os server support
PROGRAM_NAME = $(progname)
-PROGRAM_SOURCES = modules.c buildmark.c
+PROGRAM_SOURCES = modules.c
PROGRAM_LDADD = $(EXTRA_LDFLAGS) $(PROGRAM_DEPENDENCIES) $(EXTRA_LIBS)
PROGRAM_DEPENDENCIES = \
$(BUILTIN_LIBS) \
$(MPM_LIB) \
- main/libmain.la \
+ server/libmain.la \
os/$(OS_DIR)/libos.la \
- ap/libap.la \
- lib/apr/$(LIBPRE)apr.a \
- lib/pcre/libpcreposix.a \
- lib/pcre/libpcre.a
+ $(AP_LIBS)
PROGRAMS = $(PROGRAM_NAME)
-targets = $(PROGRAMS)
+targets = $(PROGRAMS)
phony_targets = $(srcdir)/buildmark.c
install_targets = install-conf install-htdocs install-icons install-other \
- install-cgi install-include install-support
-DISTCLEANFILES = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
+ install-cgi install-include install-support install-suexec
+DISTCLEAN_TARGETS = include/config_auto.h modules.c aclocal.m4 buildmk.stamp \
configure generated_lists include/ap_config_auto.h \
- include/ap_config_auto.h.in include/ap_config_path.h install-sh
+ include/ap_config_auto.h.in include/ap_config_path.h install-sh \
+ missing mkinstalldirs
include $(top_srcdir)/build/rules.mk
include $(top_srcdir)/build/program.mk
install-conf:
@echo Installing configuration files
- @test -d $(sysconfdir) || $(mkinstalldirs) $(sysconfdir)
- @cd $(srcdir)/../conf; \
+ @test -d $(sysconfdir) || $(MKINSTALLDIRS) $(sysconfdir)
+ @cd docs/conf; \
for i in mime.types magic; do \
$(INSTALL_DATA) $$i $(sysconfdir); \
done; \
- for i in *-dist; do \
+ for i in *-std*; do \
sed -e 's#@@ServerRoot@@#$(prefix)#g' \
+ -e 's#@@Port@@#$(PORT)#g' \
< $$i > $(sysconfdir)/$$i; \
chmod 0644 $(sysconfdir)/$$i; \
- file=`echo $$i|sed s/-dist//`; \
+ file=`echo $$i|sed s/-std//`; \
if [ "$$file" = "httpd.conf" ]; then \
file=`echo $$file|sed s/.*.conf/$(PROGRAM_NAME).conf/`; \
fi; \
fi; \
done
+htdocs-srcdir = docs/docroot
+
+docs: include/*.h
+ mkdir -p ./docs/api
+ srclib/apr/helpers/scandoc -ihelpers/default.pl -p./docs/api/ ./include/*.h
+
install-htdocs:
@echo Installing HTML documents
- @test -d $(htdocsdir) || $(mkinstalldirs) $(htdocsdir)
- @(cd $(srcdir)/../htdocs && cp -rp * $(htdocsdir))
+ @test -d $(htdocsdir) || $(MKINSTALLDIRS) $(htdocsdir)
+ @test -d $(htdocs-srcdir) && (cd $(htdocs-srcdir) && cp -rp * $(htdocsdir))
+ @test -d $(htdocsdir)/manual || $(MKINSTALLDIRS) $(htdocsdir)/manual
+ @test -d docs/manual && (cd docs/manual && cp -rp * $(htdocsdir)/manual)
+ @(cd $(htdocsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-icons:
@echo Installing icons
- @test -d $(iconsdir) || $(mkinstalldirs) $(iconsdir)
- @(cd $(srcdir)/../icons && cp -rp * $(iconsdir))
+ @test -d $(iconsdir) || $(MKINSTALLDIRS) $(iconsdir)
+ @(cd docs/icons && cp -rp * $(iconsdir))
+ @(cd $(iconsdir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-cgi:
@echo Installing CGIs
- @test -d $(cgidir) || $(mkinstalldirs) $(cgidir)
- @(cd $(srcdir)/../cgi-bin && cp -rp * $(cgidir))
+ @test -d $(cgidir) || $(MKINSTALLDIRS) $(cgidir)
+ @(cd docs/cgi-examples && cp -rp * $(cgidir))
+ @(cd $(cgidir) && find . -name "CVS" -print | xargs rm -rf {} \;)
install-support:
@echo Installing Support Binaries
- @test -d $(bindir) || $(mkinstalldirs) $(bindir)
+ @test -d $(bindir) || $(MKINSTALLDIRS) $(bindir)
@cp -p $(srcdir)/support/httpd.exp $(bindir)
@cp -p $(builddir)/support/htpasswd $(bindir)
@cp -p $(builddir)/support/htdigest $(bindir)
@cp -p $(builddir)/support/rotatelogs $(bindir)
@cp -p $(builddir)/support/logresolve $(bindir)
@cp -p $(builddir)/support/ab $(bindir)
+ @cp -p $(builddir)/support/apachectl $(bindir)
+ chmod 755 $(bindir)/apachectl
+ @if test -f $(builddir)/support/apxs; then \
+ cp -p $(builddir)/support/apxs $(bindir); \
+ chmod 755 $(bindir)/apxs; \
+ fi
+
install-other:
- @test -d $(logdir) || $(mkinstalldirs) $(logdir)
+ @test -d $(logdir) || $(MKINSTALLDIRS) $(logdir)
+ @for ext in dll x; do \
+ file=apachecore.$$ext; \
+ if test -f $$file; then \
+ cp -p $$file $(bindir); \
+ fi; \
+ done;
install-include:
@echo Installing header files
- @test -d $(includedir) || $(mkinstalldirs) $(includedir)
- @test -d $(includedir)/xml || $(mkinstalldirs) $(includedir)/xml
- @test -d $(includedir)/apr || $(mkinstalldirs) $(includedir)/apr
+ @test -d $(includedir) || $(MKINSTALLDIRS) $(includedir)
@cp -p include/*.h $(srcdir)/include/*.h $(includedir)
@cp -p $(srcdir)/os/$(OS_DIR)/os.h $(includedir)
- @cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir)
- @cp -p $(srcdir)/lib/expat-lite/*.h $(includedir)/xml
- @cp -p lib/apr/include/*.h $(srcdir)/lib/apr/include/*.h $(includedir)/apr
- @chmod 644 $(includedir)/*.h $(includedir)/xml/*.h $(includedir)/apr/*.h
+ @if test -f $(srcdir)/os/$(OS_DIR)/os-inline.c; then \
+ cp -p $(srcdir)/os/$(OS_DIR)/os-inline.c $(includedir); \
+ fi;
+ @cp -p $(srcdir)/modules/dav/main/mod_dav.h $(includedir)
+ @cp -p $(srcdir)/modules/filters/mod_include.h $(includedir)
+ @cp -p $(srcdir)/srclib/expat-lite/*.h $(includedir)
+ @cp -p $(srcdir)/srclib/pcre/*.h $(includedir)
+ @cp -p $(srcdir)/srclib/apr/include/*.h $(includedir)
+ @cp -p $(srcdir)/srclib/apr-util/include/*.h $(includedir)
+ @chmod 644 $(includedir)/*.h
+
+install-suexec:
+ @if test -f $(builddir)/support/suexec; then \
+ $(MKINSTALLDIRS) -p $(bindir)/sbin; \
+ cp -p $(srcdir)/support/suexec $(bindir)/sbin; \
+ fi
+
+suexec:
+ cd support && make suexec
projects / apache / blobdiff