From: hno <> Date: Wed, 26 Jun 2002 16:37:30 +0000 (+0000) Subject: Restructured the directory structure to have all helpers in the new X-Git-Tag: SQUID_3_0_PRE1~943 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c510f3c1e56610df96698133ba9c70e5003cde3;p=thirdparty%2Fsquid.git Restructured the directory structure to have all helpers in the new helpers directory. helpers/basic_auth Basic auth helpers helpers/ntlm_auth NTLM auth helpers helpers/digest_auth Digest auth helpers --- diff --git a/Makefile.am b/Makefile.am index a0dcb6dbf4..03834af29b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,11 @@ ## Process this file with automake to produce Makefile.in # -# $Id: Makefile.am,v 1.9 2002/06/23 12:57:07 hno Exp $ +# $Id: Makefile.am,v 1.10 2002/06/26 10:37:30 hno Exp $ # AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 -DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc -SUBDIRS = lib @makesnmplib@ scripts src icons errors doc +DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers +SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* diff --git a/Makefile.in b/Makefile.in index 7b141bad46..67e8466a86 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ # -# $Id: Makefile.in,v 1.17 2002/06/23 14:53:34 hno Exp $ +# $Id: Makefile.in,v 1.18 2002/06/26 10:37:30 hno Exp $ # SHELL = @SHELL@ @@ -118,8 +118,8 @@ install_sh = @install_sh@ makesnmplib = @makesnmplib@ AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 -DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc -SUBDIRS = lib @makesnmplib@ scripts src icons errors doc +DIST_SUBDIRS = lib snmplib scripts src icons errors contrib doc helpers +SUBDIRS = lib @makesnmplib@ scripts src icons errors doc helpers DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]* diff --git a/configure b/configure index 3b6c8c0ae9..f11e58958c 100755 --- a/configure +++ b/configure @@ -179,19 +179,19 @@ ac_help="$ac_help This option selects which basic scheme proxy_auth helpers to build and install as part of the normal build process. For a list of available - helpers see the src/auth/basic/helpers directory." + helpers see the helpers/basic_auth directory." ac_help="$ac_help --enable-ntlm-auth-helpers=\"list of helpers\" This option selects which proxy_auth ntlm helpers to build and install as part of the normal build - process. For a list of available modules see - the src/auth/ntlm/helpers directory." + process. For a list of available helpers see + the helpers/ntlm_auth directory." ac_help="$ac_help --enable-digest-auth-helpers=\"list of helpers\" This option selects which digest scheme authentication helpers to build and install as part of the normal build - process. For a list of available modules see the - src/auth/digest/helpers directory." + process. For a list of available helpers see the + helpers/digest_auth directory." ac_help="$ac_help --enable-ntlm-fail-open Enable NTLM fail open, where a helper that fails one of the Authentication steps can allow squid to still authenticate @@ -1027,7 +1027,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -# From configure.in Revision: 1.273 +# From configure.in Revision echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo "configure:1033: checking whether to enable maintainer-specific portions of Makefiles" >&5 # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. @@ -3031,7 +3031,7 @@ if test "${enable_auth_modules+set}" = set; then sleep 5 case "$enableval" in yes) - for helper in $srcdir/src/auth/basic/helpers/*; do + for helper in $srcdir/helpers/basic_auth/*; do if test -f $helper/Makefile.in; then BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" fi @@ -3051,7 +3051,7 @@ if test "${enable_basic_auth_helpers+set}" = set; then case "$enableval" in yes) BASIC_AUTH_HELPERS="" - for helper in $srcdir/src/auth/basic/helpers/*; do + for helper in $srcdir/helpers/basic_auth/*; do if test -f $helper/Makefile.in; then BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" fi @@ -3076,7 +3076,7 @@ if test "${enable_ntlm_auth_helpers+set}" = set; then enableval="$enable_ntlm_auth_helpers" case "$enableval" in yes) - for helper in $srcdir/src/auth/ntlm/helpers/*; do + for helper in $srcdir/helpers/ntlm_auth/*; do if test -f $helper/Makefile.in; then NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS `basename $helper`" fi @@ -3101,7 +3101,7 @@ if test "${enable_digest_auth_helpers+set}" = set; then enableval="$enable_digest_auth_helpers" case "$enableval" in yes) - for helper in $srcdir/src/auth/digest/helpers/*; do + for helper in $srcdir/helpers/digest_auth/*; do if test -f $helper/Makefile.in; then DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS `basename $helper`" fi @@ -8743,27 +8743,8 @@ trap 'rm -fr `echo "\ src/repl/Makefile \ src/auth/Makefile \ src/auth/basic/Makefile \ - src/auth/basic/helpers/Makefile \ - src/auth/basic/helpers/LDAP/Makefile \ - src/auth/basic/helpers/MSNT/Makefile \ - src/auth/basic/helpers/NCSA/Makefile \ - src/auth/basic/helpers/PAM/Makefile \ - src/auth/basic/helpers/SMB/Makefile \ - src/auth/basic/helpers/YP/Makefile \ - src/auth/basic/helpers/getpwnam/Makefile \ - src/auth/basic/helpers/multi-domain-NTLM/Makefile \ - src/auth/basic/helpers/SASL/Makefile \ - src/auth/basic/helpers/winbind/Makefile \ src/auth/digest/Makefile \ - src/auth/digest/helpers/Makefile \ - src/auth/digest/helpers/password/Makefile \ src/auth/ntlm/Makefile \ - src/auth/ntlm/helpers/Makefile \ - src/auth/ntlm/helpers/fakeauth/Makefile \ - src/auth/ntlm/helpers/no_check/Makefile \ - src/auth/ntlm/helpers/SMB/Makefile \ - src/auth/ntlm/helpers/SMB/smbval/Makefile \ - src/auth/ntlm/helpers/winbind/Makefile \ contrib/Makefile \ snmplib/Makefile \ icons/Makefile \ @@ -8776,6 +8757,26 @@ trap 'rm -fr `echo "\ src/repl/heap/Makefile \ src/repl/lru/Makefile \ doc/Makefile \ + helpers/Makefile \ + helpers/basic_auth/Makefile \ + helpers/basic_auth/LDAP/Makefile \ + helpers/basic_auth/MSNT/Makefile \ + helpers/basic_auth/NCSA/Makefile \ + helpers/basic_auth/PAM/Makefile \ + helpers/basic_auth/SMB/Makefile \ + helpers/basic_auth/YP/Makefile \ + helpers/basic_auth/getpwnam/Makefile \ + helpers/basic_auth/multi-domain-NTLM/Makefile \ + helpers/basic_auth/SASL/Makefile \ + helpers/basic_auth/winbind/Makefile \ + helpers/digest_auth/Makefile \ + helpers/digest_auth/password/Makefile \ + helpers/ntlm_auth/Makefile \ + helpers/ntlm_auth/fakeauth/Makefile \ + helpers/ntlm_auth/no_check/Makefile \ + helpers/ntlm_auth/SMB/Makefile \ + helpers/ntlm_auth/SMB/smbval/Makefile \ + helpers/ntlm_auth/winbind/Makefile \ include/autoconf.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15 EOF cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF diff --git a/configure.in b/configure.in index 829058f85f..248a7c3ba3 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ dnl Configuration input file for Squid dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.273 2002/06/17 18:28:12 hno Exp $ +dnl $Id: configure.in,v 1.274 2002/06/26 10:37:30 hno Exp $ dnl dnl dnl @@ -11,7 +11,7 @@ AC_INIT(src/main.c) AC_CONFIG_AUX_DIR(cfgaux) AM_INIT_AUTOMAKE(squid, 2.6-DEVEL) AM_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.273 $)dnl +AC_REVISION($Revision: 1.274 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AM_MAINTAINER_MODE @@ -922,7 +922,7 @@ AC_ARG_ENABLE(auth-modules, sleep 5 case "$enableval" in yes) - for helper in $srcdir/src/auth/basic/helpers/*; do + for helper in $srcdir/helpers/basic_auth/*; do if test -f $helper/Makefile.in; then BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" fi @@ -939,11 +939,11 @@ AC_ARG_ENABLE(basic-auth-helpers, This option selects which basic scheme proxy_auth helpers to build and install as part of the normal build process. For a list of available - helpers see the src/auth/basic/helpers directory.], + helpers see the helpers/basic_auth directory.], [ case "$enableval" in yes) BASIC_AUTH_HELPERS="" - for helper in $srcdir/src/auth/basic/helpers/*; do + for helper in $srcdir/helpers/basic_auth/*; do if test -f $helper/Makefile.in; then BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`" fi @@ -966,11 +966,11 @@ AC_ARG_ENABLE(ntlm-auth-helpers, [ --enable-ntlm-auth-helpers=\"list of helpers\" This option selects which proxy_auth ntlm helpers to build and install as part of the normal build - process. For a list of available modules see - the src/auth/ntlm/helpers directory.], + process. For a list of available helpers see + the helpers/ntlm_auth directory.], [ case "$enableval" in yes) - for helper in $srcdir/src/auth/ntlm/helpers/*; do + for helper in $srcdir/helpers/ntlm_auth/*; do if test -f $helper/Makefile.in; then NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS `basename $helper`" fi @@ -993,11 +993,11 @@ AC_ARG_ENABLE(digest-auth-helpers, [ --enable-digest-auth-helpers=\"list of helpers\" This option selects which digest scheme authentication helpers to build and install as part of the normal build - process. For a list of available modules see the - src/auth/digest/helpers directory.], + process. For a list of available helpers see the + helpers/digest_auth directory.], [ case "$enableval" in yes) - for helper in $srcdir/src/auth/digest/helpers/*; do + for helper in $srcdir/helpers/digest_auth/*; do if test -f $helper/Makefile.in; then DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS `basename $helper`" fi @@ -2236,27 +2236,8 @@ AC_OUTPUT([\ src/repl/Makefile \ src/auth/Makefile \ src/auth/basic/Makefile \ - src/auth/basic/helpers/Makefile \ - src/auth/basic/helpers/LDAP/Makefile \ - src/auth/basic/helpers/MSNT/Makefile \ - src/auth/basic/helpers/NCSA/Makefile \ - src/auth/basic/helpers/PAM/Makefile \ - src/auth/basic/helpers/SMB/Makefile \ - src/auth/basic/helpers/YP/Makefile \ - src/auth/basic/helpers/getpwnam/Makefile \ - src/auth/basic/helpers/multi-domain-NTLM/Makefile \ - src/auth/basic/helpers/SASL/Makefile \ - src/auth/basic/helpers/winbind/Makefile \ src/auth/digest/Makefile \ - src/auth/digest/helpers/Makefile \ - src/auth/digest/helpers/password/Makefile \ src/auth/ntlm/Makefile \ - src/auth/ntlm/helpers/Makefile \ - src/auth/ntlm/helpers/fakeauth/Makefile \ - src/auth/ntlm/helpers/no_check/Makefile \ - src/auth/ntlm/helpers/SMB/Makefile \ - src/auth/ntlm/helpers/SMB/smbval/Makefile \ - src/auth/ntlm/helpers/winbind/Makefile \ contrib/Makefile \ snmplib/Makefile \ icons/Makefile \ @@ -2269,4 +2250,24 @@ AC_OUTPUT([\ src/repl/heap/Makefile \ src/repl/lru/Makefile \ doc/Makefile \ + helpers/Makefile \ + helpers/basic_auth/Makefile \ + helpers/basic_auth/LDAP/Makefile \ + helpers/basic_auth/MSNT/Makefile \ + helpers/basic_auth/NCSA/Makefile \ + helpers/basic_auth/PAM/Makefile \ + helpers/basic_auth/SMB/Makefile \ + helpers/basic_auth/YP/Makefile \ + helpers/basic_auth/getpwnam/Makefile \ + helpers/basic_auth/multi-domain-NTLM/Makefile \ + helpers/basic_auth/SASL/Makefile \ + helpers/basic_auth/winbind/Makefile \ + helpers/digest_auth/Makefile \ + helpers/digest_auth/password/Makefile \ + helpers/ntlm_auth/Makefile \ + helpers/ntlm_auth/fakeauth/Makefile \ + helpers/ntlm_auth/no_check/Makefile \ + helpers/ntlm_auth/SMB/Makefile \ + helpers/ntlm_auth/SMB/smbval/Makefile \ + helpers/ntlm_auth/winbind/Makefile \ ]) diff --git a/helpers/Makefile.am b/helpers/Makefile.am new file mode 100644 index 0000000000..f119960ffe --- /dev/null +++ b/helpers/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = basic_auth ntlm_auth digest_auth diff --git a/helpers/Makefile.in b/helpers/Makefile.in new file mode 100644 index 0000000000..afb34192e4 --- /dev/null +++ b/helpers/Makefile.in @@ -0,0 +1,351 @@ +# Makefile.in generated automatically by automake 1.5 from Makefile.am. + +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +SHELL = @SHELL@ + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +VPATH = @srcdir@ +prefix = @prefix@ +exec_prefix = @exec_prefix@ + +bindir = @bindir@ +sbindir = @sbindir@ +libexecdir = @libexecdir@ +datadir = @datadir@ +sysconfdir = @sysconfdir@ +sharedstatedir = @sharedstatedir@ +localstatedir = @localstatedir@ +libdir = @libdir@ +infodir = @infodir@ +mandir = @mandir@ +includedir = @includedir@ +oldincludedir = /usr/include +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +top_builddir = .. + +ACLOCAL = @ACLOCAL@ +AUTOCONF = @AUTOCONF@ +AUTOMAKE = @AUTOMAKE@ +AUTOHEADER = @AUTOHEADER@ + +INSTALL = @INSTALL@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) +transform = @program_transform_name@ +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = @host_alias@ +host_triplet = @host@ +AMTAR = @AMTAR@ +AR = @AR@ +AR_R = @AR_R@ +AUTH_LIBS = @AUTH_LIBS@ +AUTH_MODULES = @AUTH_MODULES@ +AUTH_OBJS = @AUTH_OBJS@ +AWK = @AWK@ +BASIC_AUTH_HELPERS = @BASIC_AUTH_HELPERS@ +CC = @CC@ +CPP = @CPP@ +CRYPTLIB = @CRYPTLIB@ +DEPDIR = @DEPDIR@ +DIGEST_AUTH_HELPERS = @DIGEST_AUTH_HELPERS@ +ERR_DEFAULT_LANGUAGE = @ERR_DEFAULT_LANGUAGE@ +ERR_LANGUAGES = @ERR_LANGUAGES@ +EXEEXT = @EXEEXT@ +FALSE = @FALSE@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBDLMALLOC = @LIBDLMALLOC@ +LIBREGEX = @LIBREGEX@ +LIB_MALLOC = @LIB_MALLOC@ +LN = @LN@ +LN_S = @LN_S@ +MAINT = @MAINT@ +MKDIR = @MKDIR@ +MV = @MV@ +NTLM_AUTH_HELPERS = @NTLM_AUTH_HELPERS@ +OBJEXT = @OBJEXT@ +OPT_DISKD_EXE = @OPT_DISKD_EXE@ +OPT_DNSSERVER_EXE = @OPT_DNSSERVER_EXE@ +OPT_PINGER = @OPT_PINGER@ +OPT_PINGER_EXE = @OPT_PINGER_EXE@ +PACKAGE = @PACKAGE@ +PERL = @PERL@ +RANLIB = @RANLIB@ +REGEXLIB = @REGEXLIB@ +REPL_LIBS = @REPL_LIBS@ +REPL_OBJS = @REPL_OBJS@ +REPL_POLICIES = @REPL_POLICIES@ +RM = @RM@ +SH = @SH@ +SNMPLIB = @SNMPLIB@ +SSLLIB = @SSLLIB@ +STORE_LIBS = @STORE_LIBS@ +STORE_MODULES = @STORE_MODULES@ +STORE_MODULE_SUBDIRS = @STORE_MODULE_SUBDIRS@ +STORE_OBJS = @STORE_OBJS@ +TRUE = @TRUE@ +VERSION = @VERSION@ +XTRA_LIBS = @XTRA_LIBS@ +XTRA_OBJS = @XTRA_OBJS@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ +makesnmplib = @makesnmplib@ + +SUBDIRS = basic_auth ntlm_auth digest_auth +subdir = helpers +mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs +CONFIG_HEADER = $(top_builddir)/include/autoconf.h +CONFIG_CLEAN_FILES = +DIST_SOURCES = + +RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \ + uninstall-info-recursive all-recursive install-data-recursive \ + install-exec-recursive installdirs-recursive install-recursive \ + uninstall-recursive check-recursive installcheck-recursive +DIST_COMMON = Makefile.am Makefile.in +DIST_SUBDIRS = $(SUBDIRS) +all: all-recursive + +.SUFFIXES: +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign helpers/Makefile +Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && \ + CONFIG_HEADERS= CONFIG_LINKS= \ + CONFIG_FILES=$(subdir)/$@ $(SHELL) ./config.status +uninstall-info-am: + +# This directory's subdirectories are mostly independent; you can cd +# into them and run `make' without going through this Makefile. +# To change the values of `make' variables: instead of editing Makefiles, +# (1) if the variable is set in `config.status', edit `config.status' +# (which will cause the Makefiles to be regenerated when you run `make'); +# (2) otherwise, pass the desired values on the `make' command line. +$(RECURSIVE_TARGETS): + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + target=`echo $@ | sed s/-recursive//`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + dot_seen=yes; \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done; \ + if test "$$dot_seen" = "no"; then \ + $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ + fi; test -z "$$fail" + +mostlyclean-recursive clean-recursive distclean-recursive \ +maintainer-clean-recursive: + @set fnord $(MAKEFLAGS); amf=$$2; \ + dot_seen=no; \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + rev=''; for subdir in $$list; do \ + if test "$$subdir" = "."; then :; else \ + rev="$$subdir $$rev"; \ + fi; \ + done; \ + rev="$$rev ."; \ + target=`echo $@ | sed s/-recursive//`; \ + for subdir in $$rev; do \ + echo "Making $$target in $$subdir"; \ + if test "$$subdir" = "."; then \ + local_target="$$target-am"; \ + else \ + local_target="$$target"; \ + fi; \ + (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ + || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ + done && test -z "$$fail" +tags-recursive: + list='$(SUBDIRS)'; for subdir in $$list; do \ + test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ + done + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique $(LISP) + +TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SUBDIRS)'; for subdir in $$list; do \ + if test "$$subdir" = .; then :; else \ + test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ + fi; \ + done; \ + list='$(SOURCES) $(HEADERS) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ + || etags $(ETAGS_ARGS) $$tags $$unique $(LISP) + +GTAGS: + here=`CDPATH=: && cd $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH + +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = .. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + if test -f $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + $(mkinstalldirs) "$(distdir)/$$dir"; \ + fi; \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir) \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + for subdir in $(SUBDIRS); do \ + if test "$$subdir" = .; then :; else \ + test -d $(distdir)/$$subdir \ + || mkdir $(distdir)/$$subdir \ + || exit 1; \ + (cd $$subdir && \ + $(MAKE) $(AM_MAKEFLAGS) \ + top_distdir="$(top_distdir)" \ + distdir=../$(distdir)/$$subdir \ + distdir) \ + || exit 1; \ + fi; \ + done +check-am: all-am +check: check-recursive +all-am: Makefile +installdirs: installdirs-recursive +installdirs-am: + +install: install-recursive +install-exec: install-exec-recursive +install-data: install-data-recursive +uninstall: uninstall-recursive + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-recursive +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-recursive + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-recursive + +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-recursive + +dvi-am: + +info: info-recursive + +info-am: + +install-data-am: + +install-exec-am: + +install-info: install-info-recursive + +install-man: + +installcheck-am: + +maintainer-clean: maintainer-clean-recursive + +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-recursive + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am + +uninstall-info: uninstall-info-recursive + +.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \ + clean-generic clean-recursive distclean distclean-generic \ + distclean-recursive distclean-tags distdir dvi dvi-am \ + dvi-recursive info info-am info-recursive install install-am \ + install-data install-data-am install-data-recursive \ + install-exec install-exec-am install-exec-recursive \ + install-info install-info-am install-info-recursive install-man \ + install-recursive install-strip installcheck installcheck-am \ + installdirs installdirs-am installdirs-recursive \ + maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive tags tags-recursive uninstall \ + uninstall-am uninstall-info-am uninstall-info-recursive \ + uninstall-recursive + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/helpers/basic_auth/LDAP/Makefile.in b/helpers/basic_auth/LDAP/Makefile.in index 47412c9a55..1935328d6f 100644 --- a/helpers/basic_auth/LDAP/Makefile.in +++ b/helpers/basic_auth/LDAP/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid LDAP authentication helper # -# $Id: Makefile.in,v 1.13 2002/04/13 15:37:51 hno Exp $ +# $Id: Makefile.in,v 1.14 2002/06/26 10:37:32 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -127,7 +127,7 @@ EXTRA_DIST = squid_ldap_auth.8 squid_ldap_auth_SOURCES = squid_ldap_auth.c LDADD = -lldap -llber -subdir = src/auth/basic/helpers/LDAP +subdir = helpers/basic_auth/LDAP mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -165,7 +165,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/LDAP/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/LDAP/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -295,7 +295,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/MSNT/Makefile.in b/helpers/basic_auth/MSNT/Makefile.in index 5df2f112be..19773ea1a6 100644 --- a/helpers/basic_auth/MSNT/Makefile.in +++ b/helpers/basic_auth/MSNT/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.14 2002/06/19 22:53:56 wessels Exp $ +# $Id: Makefile.in,v 1.15 2002/06/26 10:37:33 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -144,7 +144,7 @@ LDADD = @XTRA_LIBS@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -subdir = src/auth/basic/helpers/MSNT +subdir = helpers/basic_auth/MSNT mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -189,7 +189,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/MSNT/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/MSNT/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -293,7 +293,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in index 08f3aab88d..b43dcd0608 100644 --- a/helpers/basic_auth/Makefile.in +++ b/helpers/basic_auth/Makefile.in @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.12 2002/05/20 01:48:02 hno Exp $ +# $Id: Makefile.in,v 1.13 2002/06/26 10:37:32 hno Exp $ # SHELL = @SHELL@ @@ -41,7 +41,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. +top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -120,7 +120,7 @@ makesnmplib = @makesnmplib@ DIST_SUBDIRS = getpwnam LDAP MSNT multi-domain-NTLM NCSA PAM SMB YP SASL winbind SUBDIRS = @BASIC_AUTH_HELPERS@ -subdir = src/auth/basic/helpers +subdir = helpers/basic_auth mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -136,7 +136,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -237,7 +237,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/NCSA/Makefile.in b/helpers/basic_auth/NCSA/Makefile.in index 50482a7bdb..8660ee39e5 100644 --- a/helpers/basic_auth/NCSA/Makefile.in +++ b/helpers/basic_auth/NCSA/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.11 2002/04/13 15:37:55 hno Exp $ +# $Id: Makefile.in,v 1.12 2002/06/26 10:37:34 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -127,7 +127,7 @@ LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -subdir = src/auth/basic/helpers/NCSA +subdir = helpers/basic_auth/NCSA mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -162,7 +162,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/NCSA/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/NCSA/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -253,7 +253,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/PAM/Makefile.in b/helpers/basic_auth/PAM/Makefile.in index ac203c4606..993acc65d2 100644 --- a/helpers/basic_auth/PAM/Makefile.in +++ b/helpers/basic_auth/PAM/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid PAM authentication helper # -# $Id: Makefile.in,v 1.12 2002/04/13 15:37:56 hno Exp $ +# $Id: Makefile.in,v 1.13 2002/06/26 10:37:34 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -129,7 +129,7 @@ man_MANS = pam_auth.8 EXTRA_DIST = pam_auth.8 libexec_PROGRAMS = pam_auth LDADD = -lpam $(XTRA_LIBS) -subdir = src/auth/basic/helpers/PAM +subdir = helpers/basic_auth/PAM mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -167,7 +167,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/PAM/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/PAM/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -297,7 +297,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/SASL/Makefile.in b/helpers/basic_auth/SASL/Makefile.in index 8a3ba1e6be..bc21880afb 100644 --- a/helpers/basic_auth/SASL/Makefile.in +++ b/helpers/basic_auth/SASL/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid SASL authentication helper # -# $Id: Makefile.in,v 1.9 2002/04/15 00:17:19 hno Exp $ +# $Id: Makefile.in,v 1.10 2002/06/26 10:37:35 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -128,7 +128,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ libexec_PROGRAMS = sasl_auth LDADD = -lsasl $(XTRA_LIBS) EXTRA_DIST = squid_sasl_auth squid_sasl_auth.conf -subdir = src/auth/basic/helpers/SASL +subdir = helpers/basic_auth/SASL mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -163,7 +163,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/SASL/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/SASL/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -254,7 +254,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/SMB/Makefile.in b/helpers/basic_auth/SMB/Makefile.in index 4e188f8368..89aae12a63 100644 --- a/helpers/basic_auth/SMB/Makefile.in +++ b/helpers/basic_auth/SMB/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.12 2002/05/20 02:05:32 hno Exp $ +# $Id: Makefile.in,v 1.13 2002/06/26 10:37:35 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -49,7 +49,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -140,7 +140,7 @@ LDADD = $(XTRA_LIBS) INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -subdir = src/auth/basic/helpers/SMB +subdir = helpers/basic_auth/SMB mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -177,7 +177,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/SMB/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/SMB/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -302,7 +302,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/YP/Makefile.in b/helpers/basic_auth/YP/Makefile.in index ade5086b90..fcc3aff86b 100644 --- a/helpers/basic_auth/YP/Makefile.in +++ b/helpers/basic_auth/YP/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.13 2002/04/13 15:37:59 hno Exp $ +# $Id: Makefile.in,v 1.14 2002/06/26 10:37:36 hno Exp $ # # @@ -43,7 +43,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -126,7 +126,7 @@ LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ -subdir = src/auth/basic/helpers/YP +subdir = helpers/basic_auth/YP mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -161,7 +161,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/YP/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/YP/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -253,7 +253,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/getpwnam/Makefile.in b/helpers/basic_auth/getpwnam/Makefile.in index 6c6810d852..b12dd9c202 100644 --- a/helpers/basic_auth/getpwnam/Makefile.in +++ b/helpers/basic_auth/getpwnam/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.11 2002/04/13 15:38:00 hno Exp $ +# $Id: Makefile.in,v 1.12 2002/06/26 10:37:37 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -130,7 +130,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) -subdir = src/auth/basic/helpers/getpwnam +subdir = helpers/basic_auth/getpwnam mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -165,7 +165,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/getpwnam/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/getpwnam/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -256,7 +256,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/multi-domain-NTLM/Makefile.in b/helpers/basic_auth/multi-domain-NTLM/Makefile.in index 49fce7d138..49bb5bbbf8 100644 --- a/helpers/basic_auth/multi-domain-NTLM/Makefile.in +++ b/helpers/basic_auth/multi-domain-NTLM/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.10 2002/05/20 02:05:34 hno Exp $ +# $Id: Makefile.in,v 1.11 2002/06/26 10:37:38 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -129,7 +129,7 @@ EXTRA_DIST = \ smb_auth.pl \ README.txt -subdir = src/auth/basic/helpers/multi-domain-NTLM +subdir = helpers/basic_auth/multi-domain-NTLM mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -142,7 +142,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/multi-domain-NTLM/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/multi-domain-NTLM/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -175,7 +175,7 @@ TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/basic_auth/winbind/Makefile.in b/helpers/basic_auth/winbind/Makefile.in index 01b546c68c..aa252e1cbd 100644 --- a/helpers/basic_auth/winbind/Makefile.in +++ b/helpers/basic_auth/winbind/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.3 2002/05/23 14:03:43 hno Exp $ +# $Id: Makefile.in,v 1.4 2002/06/26 10:37:38 hno Exp $ # SHELL = @SHELL@ @@ -42,7 +42,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -125,7 +125,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) -subdir = src/auth/basic/helpers/winbind +subdir = helpers/basic_auth/winbind mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -161,7 +161,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/basic/helpers/winbind/Makefile + $(AUTOMAKE) --foreign helpers/basic_auth/winbind/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -253,7 +253,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/digest_auth/Makefile.in b/helpers/digest_auth/Makefile.in index 41e33357ba..9bfc43395f 100644 --- a/helpers/digest_auth/Makefile.in +++ b/helpers/digest_auth/Makefile.in @@ -15,7 +15,7 @@ # Makefile for digest auth helpers in the Squid Object Cache server # -# $Id: Makefile.in,v 1.9 2002/04/13 15:38:03 hno Exp $ +# $Id: Makefile.in,v 1.10 2002/06/26 10:37:39 hno Exp $ # SHELL = @SHELL@ @@ -41,7 +41,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. +top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -120,7 +120,7 @@ makesnmplib = @makesnmplib@ DIST_SUBDIRS = password SUBDIRS = @DIGEST_AUTH_HELPERS@ -subdir = src/auth/digest/helpers +subdir = helpers/digest_auth mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -136,7 +136,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/digest/helpers/Makefile + $(AUTOMAKE) --foreign helpers/digest_auth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -237,7 +237,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/digest_auth/password/Makefile.in b/helpers/digest_auth/password/Makefile.in index 9a3813b826..1644b246f8 100644 --- a/helpers/digest_auth/password/Makefile.in +++ b/helpers/digest_auth/password/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.11 2002/04/13 15:38:04 hno Exp $ +# $Id: Makefile.in,v 1.12 2002/06/26 10:37:39 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -127,7 +127,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) $(SSLLIB) -subdir = src/auth/digest/helpers/password +subdir = helpers/digest_auth/password mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -162,7 +162,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/digest/helpers/password/Makefile + $(AUTOMAKE) --foreign helpers/digest_auth/password/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -253,7 +253,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/ntlm_auth/Makefile.in b/helpers/ntlm_auth/Makefile.in index 2b2986369b..d3a6003ebf 100644 --- a/helpers/ntlm_auth/Makefile.in +++ b/helpers/ntlm_auth/Makefile.in @@ -15,7 +15,7 @@ # Makefile for storage modules in the Squid Object Cache server # -# $Id: Makefile.in,v 1.12 2002/05/19 23:48:20 hno Exp $ +# $Id: Makefile.in,v 1.13 2002/06/26 10:37:40 hno Exp $ # SHELL = @SHELL@ @@ -41,7 +41,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../.. +top_builddir = ../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -120,7 +120,7 @@ makesnmplib = @makesnmplib@ DIST_SUBDIRS = fakeauth no_check SMB winbind SUBDIRS = @NTLM_AUTH_HELPERS@ -subdir = src/auth/ntlm/helpers +subdir = helpers/ntlm_auth mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -136,7 +136,7 @@ all: all-recursive .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/ntlm/helpers/Makefile + $(AUTOMAKE) --foreign helpers/ntlm_auth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -237,7 +237,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../.. +top_distdir = ../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/ntlm_auth/SMB/Makefile.in b/helpers/ntlm_auth/SMB/Makefile.in index 3072b0a6cf..c76f59f8ae 100644 --- a/helpers/ntlm_auth/SMB/Makefile.in +++ b/helpers/ntlm_auth/SMB/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.12 2002/05/19 15:16:40 hno Exp $ +# $Id: Makefile.in,v 1.13 2002/06/26 10:37:41 hno Exp $ # SHELL = @SHELL@ @@ -42,7 +42,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -129,7 +129,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ LDADD = smbval/libsmbvalid.a -L$(top_builddir)/lib -lntlmauth \ -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) -subdir = src/auth/ntlm/helpers/SMB +subdir = helpers/ntlm_auth/SMB mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -170,7 +170,7 @@ all: all-recursive .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/ntlm/helpers/SMB/Makefile + $(AUTOMAKE) --foreign helpers/ntlm_auth/SMB/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -322,7 +322,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/ntlm_auth/SMB/smbval/Makefile.in b/helpers/ntlm_auth/SMB/smbval/Makefile.in index e1c9ff4e5a..64409f6892 100644 --- a/helpers/ntlm_auth/SMB/smbval/Makefile.in +++ b/helpers/ntlm_auth/SMB/smbval/Makefile.in @@ -38,7 +38,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../../.. +top_builddir = ../../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -126,7 +126,7 @@ libsmbvalid_a_SOURCES = valid.c session.c rfcnb-util.c rfcnb-io.c \ md4.h rfcnb-io.h rfcnb.h smblib-common.h std-defines.h \ rfcnb-common.h rfcnb-priv.h smbdes.h smblib-priv.h std-includes.h -subdir = src/auth/ntlm/helpers/SMB/smbval +subdir = helpers/ntlm_auth/SMB/smbval mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -166,7 +166,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/ntlm/helpers/SMB/smbval/Makefile + $(AUTOMAKE) --foreign helpers/ntlm_auth/SMB/smbval/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -248,7 +248,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../../.. +top_distdir = ../../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/ntlm_auth/fakeauth/Makefile.in b/helpers/ntlm_auth/fakeauth/Makefile.in index b862dde92a..c4669c35a8 100644 --- a/helpers/ntlm_auth/fakeauth/Makefile.in +++ b/helpers/ntlm_auth/fakeauth/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.11 2002/04/13 15:38:09 hno Exp $ +# $Id: Makefile.in,v 1.12 2002/06/26 10:37:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -127,7 +127,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src/ LDADD = -L$(top_builddir)/lib -lmiscutil $(CRYPTLIB) $(XTRA_LIBS) -subdir = src/auth/ntlm/helpers/fakeauth +subdir = helpers/ntlm_auth/fakeauth mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -162,7 +162,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/ntlm/helpers/fakeauth/Makefile + $(AUTOMAKE) --foreign helpers/ntlm_auth/fakeauth/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -253,7 +253,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/ntlm_auth/no_check/Makefile.in b/helpers/ntlm_auth/no_check/Makefile.in index b5571e988a..7595eee969 100644 --- a/helpers/ntlm_auth/no_check/Makefile.in +++ b/helpers/ntlm_auth/no_check/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.13 2002/05/20 02:05:35 hno Exp $ +# $Id: Makefile.in,v 1.14 2002/06/26 10:37:42 hno Exp $ # # Uncomment and customize the following to suit your needs: # @@ -44,7 +44,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -127,7 +127,7 @@ EXTRA_DIST = \ no_check.pl \ README.no_check_ntlm_auth -subdir = src/auth/ntlm/helpers/no_check +subdir = helpers/ntlm_auth/no_check mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -140,7 +140,7 @@ all: all-am .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/ntlm/helpers/no_check/Makefile + $(AUTOMAKE) --foreign helpers/ntlm_auth/no_check/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -173,7 +173,7 @@ TAGS: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/helpers/ntlm_auth/winbind/Makefile.in b/helpers/ntlm_auth/winbind/Makefile.in index 2322d2210c..d11e6309ba 100644 --- a/helpers/ntlm_auth/winbind/Makefile.in +++ b/helpers/ntlm_auth/winbind/Makefile.in @@ -16,7 +16,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.4 2002/05/23 14:03:44 hno Exp $ +# $Id: Makefile.in,v 1.5 2002/06/26 10:37:43 hno Exp $ # SHELL = @SHELL@ @@ -42,7 +42,7 @@ oldincludedir = /usr/include pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ -top_builddir = ../../../../.. +top_builddir = ../../.. ACLOCAL = @ACLOCAL@ AUTOCONF = @AUTOCONF@ @@ -129,7 +129,7 @@ INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/src LDADD = -L$(top_builddir)/lib -lmiscutil -lntlmauth $(XTRA_LIBS) -subdir = src/auth/ntlm/helpers/winbind +subdir = helpers/ntlm_auth/winbind mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h CONFIG_CLEAN_FILES = @@ -164,7 +164,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/auth/ntlm/helpers/winbind/Makefile + $(AUTOMAKE) --foreign helpers/ntlm_auth/winbind/Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && \ CONFIG_HEADERS= CONFIG_LINKS= \ @@ -256,7 +256,7 @@ distclean-tags: DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -top_distdir = ../../../../.. +top_distdir = ../../.. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) diff --git a/src/auth/basic/Makefile.am b/src/auth/basic/Makefile.am index 9cc765539c..150a20f006 100644 --- a/src/auth/basic/Makefile.am +++ b/src/auth/basic/Makefile.am @@ -1 +1 @@ -SUBDIRS = helpers +SUBDIRS = diff --git a/src/auth/basic/Makefile.in b/src/auth/basic/Makefile.in index 1e221160fa..3839c383d9 100644 --- a/src/auth/basic/Makefile.in +++ b/src/auth/basic/Makefile.in @@ -113,7 +113,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ makesnmplib = @makesnmplib@ -SUBDIRS = helpers +SUBDIRS = subdir = src/auth/basic mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h diff --git a/src/auth/digest/Makefile.am b/src/auth/digest/Makefile.am index 9cc765539c..150a20f006 100644 --- a/src/auth/digest/Makefile.am +++ b/src/auth/digest/Makefile.am @@ -1 +1 @@ -SUBDIRS = helpers +SUBDIRS = diff --git a/src/auth/digest/Makefile.in b/src/auth/digest/Makefile.in index c3cd753408..e323f96fef 100644 --- a/src/auth/digest/Makefile.in +++ b/src/auth/digest/Makefile.in @@ -113,7 +113,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ makesnmplib = @makesnmplib@ -SUBDIRS = helpers +SUBDIRS = subdir = src/auth/digest mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h diff --git a/src/auth/ntlm/Makefile.am b/src/auth/ntlm/Makefile.am index 9cc765539c..741f850856 100644 --- a/src/auth/ntlm/Makefile.am +++ b/src/auth/ntlm/Makefile.am @@ -1 +1 @@ -SUBDIRS = helpers +SUBDIRS = diff --git a/src/auth/ntlm/Makefile.in b/src/auth/ntlm/Makefile.in index f60dd4241f..05206b4e00 100644 --- a/src/auth/ntlm/Makefile.in +++ b/src/auth/ntlm/Makefile.in @@ -113,7 +113,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ makesnmplib = @makesnmplib@ -SUBDIRS = helpers +SUBDIRS = subdir = src/auth/ntlm mkinstalldirs = $(SHELL) $(top_srcdir)/cfgaux/mkinstalldirs CONFIG_HEADER = $(top_builddir)/include/autoconf.h