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 ee23fa0fb990a931d77d79c02ffa38a24b1fb614..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.23 2002/04/14 15:57:01 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,20 +70,23 @@ EXTRA_PROGRAMS = \
 noinst_PROGRAMS = \
        cf_gen
 
+sbin_PROGRAMS = \
+       squid
+
 bin_PROGRAMS = \
-       squid \
        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 \
@@ -111,6 +114,9 @@ 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 \
@@ -124,6 +130,7 @@ squid_SOURCES = \
        errorpage.c \
        ETag.c \
        event.c \
+       external_acl.c \
        fd.c \
        filemap.c \
        forward.c \
@@ -221,6 +228,7 @@ squid_LDADD = \
        @SSLLIB@ \
        -lmiscutil \
        @XTRA_LIBS@
+squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a
 
 unlinkd_SOURCES = 
 unlinkd_LDADD = unlinkd-daemon.o
@@ -279,6 +287,7 @@ DEFAULT_DISKD               = $(libexecdir)/@OPT_DISKD_EXE@
 DEFAULT_ICON_DIR       = $(datadir)/icons
 DEFAULT_ERROR_DIR      = $(datadir)/errors/@ERR_DEFAULT_LANGUAGE@
 DEFAULT_MIB_PATH       = $(datadir)/mib.txt
+DEFAULT_HOSTS          = @OPT_DEFAULT_HOSTS@
 
 DEFS = @DEFS@ -DDEFAULT_CONFIG_FILE=\"$(DEFAULT_CONFIG_FILE)\"
 
@@ -328,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