X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makefile.in;h=06adb3b8c1eb6161d5eaa06a0a8282921a0467dc;hb=e8f5438cab16bd559634c865d5d6f3ba60e7f7ac;hp=42e7c58b06b7ac05fd8ac420a002dcbedec0baa0;hpb=a6be4967649b310c5a60d4dc2ec35fb99ff0ffd1;p=thirdparty%2Fsarg.git

diff --git a/Makefile.in b/Makefile.in
index 42e7c58..06adb3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -24,21 +24,45 @@ CFLAGS      = @CFLAGS@
 CPPFLAGS    = @CPPFLAGS@
 LDFLAGS     = @LDFLAGS@
 DEFS        = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR) $(ILOCALEDIR) @DEFS@
-LIBS        = @LIBS@ -lm
+LIBS        = @LIBS@ @LIBINTL@ -lm
 SRCDIR      = .
 VPATH       = .
 INSTALL     = cp
+XSL_MAN_STYLESHEET=@XSL_MAN_STYLESHEET@
+XSL_HTML_STYLESHEET=@XSL_HTML_STYLESHEET@
+EXEEXT      = @EXEEXT@
 
 INSTALL_PROGRAM = $(INSTALL)
 
 SRCS = util.c log.c report.c topuser.c email.c sort.c html.c \
-       index.c getconf.c usage.c decomp.c ip2name.c ip2name_dns.c \
-       useragent.c exclude.c convlog.c totday.c repday.c datafile.c\
-       indexonly.c splitlog.c lastlog.c topsites.c siteuser.c css.c \
-       smartfilter.c denied.c authfail.c charset.c dichotomic.c \
-       redirector.c auth.c download.c grepday.c ip2name_exec.c \
-       dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c \
-       usertab.c userinfo.c longline.c url.c
+   index.c getconf.c usage.c decomp.c ip2name.c ip2name_dns.c \
+   useragent.c exclude.c convlog.c totday.c repday.c datafile.c\
+   indexonly.c splitlog.c lastlog.c topsites.c siteuser.c css.c \
+   smartfilter.c denied.c authfail.c dichotomic.c \
+   redirector.c auth.c download.c grepday.c ip2name_exec.c \
+   dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c \
+   usertab.c userinfo.c longline.c url.c fnmatch.c stringbuffer.c \
+   filelist.c readlog.c alias.c fileobject.c \
+   readlog_squid.c readlog_sarg.c readlog_extlog.c readlog_common.c
+
+all: sarg
+
+*.o: include/conf.h include/info.h include/defs.h
+
+alias.o: include/alias.h include/stringbuffer.h
+authfail.o: include/readlog.h
+denied.o: include/readlog.h
+download.o: include/readlog.h
+filelist.o: include/stringbuffer.h
+log.o: include/readlog.h
+readlog.o: include/readlog.h
+readlog_common.o: include/readlog.h
+readlog_extlog.o: include/readlog.h
+readlog_sarg.o: include/readlog.h
+readlog_squid.o: include/readlog.h
+stringbuffer.o: include/stringbuffer.h
+userinfo.o: include/stringbuffer.h include/alias.h
+fileobject.o: include/fileobject.h
 
 OBJS = $(SRCS:.c=.o)
 
@@ -47,13 +71,9 @@ DISTFILES = $(SRCS) ABOUT-NLS
 SUBDIRS = po
 .PHONY: all install clean uninstall mostlyclean distclean update-po doc $(SUBDIRS)
 
-all: sarg
-
 .c.o:
 	$(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $<
 
-*.o: include/conf.h include/info.h include/defs.h
-
 sarg: $(OBJS)
 	$(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS) $(LIBCRYPT)
 
@@ -65,13 +85,13 @@ doc: sarg.1 sarg_manpage.html
 sarg.1: sarg_manpage.xml
 	echo "Making manual page"
 	xmllint --nonet --valid --noout $<
-	xsltproc --stringparam man.output.encoding latin1 --nonet /usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl $<
+	xsltproc --stringparam man.output.encoding latin1 --nonet "$(XSL_MAN_STYLESHEET)" $<
 #	docbook2man.pl $<
 
 sarg_manpage.html: sarg_manpage.xml
 	echo "Making html manual page"
 	xmllint --nonet --valid --noout $<
-	xsltproc --stringparam use.id.as.filename 1 --stringparam root.filename sarg_manpage --nonet /usr/share/sgml/docbook/xsl-stylesheets/html/onechunk.xsl $<
+	xsltproc --stringparam use.id.as.filename 1 --stringparam root.filename sarg_manpage --nonet "$(XSL_HTML_STYLESHEET)" $<
 
 install: all install-po
 	-@if test ! -d $(DESTDIR)$(bindir); then \
@@ -90,8 +110,8 @@ install: all install-po
 		echo "Creating $(DESTDIR)$(IMAGEDIR)"; \
 		mkdir -p $(DESTDIR)$(IMAGEDIR); \
 	fi
-	$(INSTALL_PROGRAM) sarg $(DESTDIR)$(bindir)/sarg
-	chmod 755 $(DESTDIR)$(bindir)/sarg
+	$(INSTALL_PROGRAM) sarg$(EXEEXT) $(DESTDIR)$(bindir)/sarg$(EXEEXT);
+	chmod 755 $(DESTDIR)$(bindir)/sarg$(EXEEXT);
 	$(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(man1dir)/sarg.1
 	chmod 755 $(DESTDIR)$(man1dir)/sarg.1
 	@if test ! -f $(DESTDIR)$(sysconfdir)/sarg.conf; then \