fix headers to allow inclusion into C++ source

[thirdparty/squid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 7de4aad405fcf856e56bb786a5a682f8328494c1..9759897b51eb060daec2bf6560dfc6165f2dff65 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.14 2001/11/30 15:27:13 hno Exp $
+#  $Id: Makefile.am,v 1.30 2002/09/15 06:40:56 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -70,19 +70,23 @@ EXTRA_PROGRAMS = \
 noinst_PROGRAMS = \
        cf_gen
 
+sbin_PROGRAMS = \
+       squid
+
 bin_PROGRAMS = \
-       squid \
-       client
+       squidclient
 
 libexec_PROGRAMS = \
        @OPT_PINGER@ \
        $(DNSSERVER) \
        $(UNLINKD) \
-       cachemgr
+       cachemgr$(CGIEXT)
 
 cf_gen_SOURCES = cf_gen.c defines.h
 nodist_cf_gen_HEADER = cf_gen_defines.h
 cf_gen.$(OBJEXT): cf_gen_defines.h
+squidclient_SOURCES = client.c
+cachemgr__CGIEXT__SOURCES = cachemgr.c
 
 EXTRA_squid_SOURCES = \
        delay_pools.c \
@@ -95,6 +99,7 @@ EXTRA_squid_SOURCES = \
        snmp_agent.c \
        unlinkd.c \
        ssl_support.c \
+       ssl_support.h \
        win32.c
 
 squid_SOURCES = \
@@ -109,8 +114,13 @@ squid_SOURCES = \
        cbdata.c \
        client_db.c \
        client_side.c \
+       client_side_reply.c \
+       client_side_request.c \
+       clientStream.c \
        comm.c \
        comm_select.c \
+       comm_poll.c \
+       comm_kqueue.c \
        debug.c \
        defines.h \
        $(DELAY_POOL_SOURCE) \
@@ -120,6 +130,7 @@ squid_SOURCES = \
        errorpage.c \
        ETag.c \
        event.c \
+       external_acl.c \
        fd.c \
        filemap.c \
        forward.c \
@@ -151,7 +162,6 @@ squid_SOURCES = \
        logfile.c \
        main.c \
        mem.c \
-       MemPool.c \
        MemBuf.c \
        mime.c \
        multicast.c \
@@ -213,13 +223,12 @@ squid_LDADD = \
        @AUTH_OBJS@ \
        @CRYPTLIB@ \
        @REGEXLIB@ \
-       @SQUID_AIO_LIB@ \
-       @SQUID_PTHREAD_LIB@ \
        @SNMPLIB@ \
        @LIB_MALLOC@ \
        @SSLLIB@ \
        -lmiscutil \
        @XTRA_LIBS@
+squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a
 
 unlinkd_SOURCES = 
 unlinkd_LDADD = unlinkd-daemon.o
@@ -228,7 +237,9 @@ unlinkd-daemon.o: unlinkd.c
 
 pinger_SOURCES = \
        pinger.c \
-       debug.c \
+       debug.c
+
+nodist_pinger_SOURCES = \
        globals.c
 
 BUILT_SOURCES = \
@@ -242,9 +253,11 @@ BUILT_SOURCES = \
 
 sysconf_DATA = \
        squid.conf.default \
-       mib.txt \
        mime.conf.default
 
+data_DATA = \
+       mib.txt
+
 LDADD = -L../lib -lmiscutil @XTRA_LIBS@
 
 EXTRA_DIST = \
@@ -273,7 +286,8 @@ DEFAULT_UNLINKD             = $(libexecdir)/$(UNLINKD_EXE)
 DEFAULT_DISKD          = $(libexecdir)/@OPT_DISKD_EXE@
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
-DEFAULT_MIB_PATH       = $(sysconfdir)/mib.txt
+DEFAULT_MIB_PATH       = $(datadir)/mib.txt
+DEFAULT_HOSTS          = @OPT_DEFAULT_HOSTS@
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
@@ -323,7 +337,8 @@ cf.data: cf.data.pre Makefile
        s%@DEFAULT_ICON_DIR@%$(DEFAULT_ICON_DIR)%g;\
        s%@DEFAULT_MIB_PATH@%$(DEFAULT_MIB_PATH)%g;\
        s%@DEFAULT_ERROR_DIR@%$(DEFAULT_ERROR_DIR)%g;\
-       s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;"\
+       s%@DEFAULT_PREFIX@%$(DEFAULT_PREFIX)%g;\
+       s%@DEFAULT_HOSTS@%$(DEFAULT_HOSTS)%g;"\
        < $(srcdir)/cf.data.pre >$@
 
 store_modules.c: store_modules.sh Makefile
@@ -335,29 +350,29 @@ repl_modules.c: repl_modules.sh Makefile
 auth_modules.c: auth_modules.sh Makefile
        @$(SHELL) $(srcdir)/auth_modules.sh $(AUTH_MODULES) >auth_modules.c
 
-install-data-local: install-sysconfDATA
-       @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
-               echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/mime.conf" ; \
+install-data-local: install-sysconfDATA install-dataDATA
+       @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
+               echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_MIME_TABLE)" ; \
        else \
-               echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf" ;\
-               $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(sysconfdir)/mime.conf; \
+               echo "$(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE)" ;\
+               $(INSTALL_DATA) $(srcdir)/mime.conf.default $(DESTDIR)$(DEFAULT_MIME_TABLE); \
        fi
-       @if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \
-               echo "$@ will not overwrite existing $(DESTDIR)$(sysconfdir)/squid.conf" ; \
+       @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+               echo "$@ will not overwrite existing $(DESTDIR)$(DEFAULT_CONFIG_FILE)" ; \
        else \
-               echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf"; \
-               $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(sysconfdir)/squid.conf; \
+               echo "$(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+               $(INSTALL_DATA) squid.conf.default $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
        fi
        $(mkinstalldirs) $(DESTDIR)$(DEFAULT_LOG_PREFIX)
 
 uninstall-local:
-       @if test -f $(DESTDIR)$(sysconfdir)/mime.conf ; then \
-               echo "rm -f $(DESTDIR)$(sysconfdir)/mime.conf"; \
-               $(RM) -f $(DESTDIR)$(sysconfdir)/mime.conf; \
+       @if test -f $(DESTDIR)$(DEFAULT_MIME_TABLE) ; then \
+               echo "rm -f $(DESTDIR)$(DEFAULT_MIME_TABLE)"; \
+               $(RM) -f $(DESTDIR)$(DEFAULT_MIME_TABLE); \
        fi
-       @if test -f $(DESTDIR)$(sysconfdir)/squid.conf ; then \
-               echo "rm -f $(DESTDIR)$(sysconfdir)/squid.conf"; \
-               $(RM) -f $(DESTDIR)$(sysconfdir)/squid.conf; \
+       @if test -f $(DESTDIR)$(DEFAULT_CONFIG_FILE) ; then \
+               echo "rm -f $(DESTDIR)$(DEFAULT_CONFIG_FILE)"; \
+               $(RM) -f $(DESTDIR)$(DEFAULT_CONFIG_FILE); \
        fi
 
 DISTCLEANFILES = cf_gen_defines.h cf.data cf_parser.h squid.conf.default \