ia a Squid Analysis Report Generator.
| Makefile.in (sarg-2.3.11) | : | Makefile.in (sarg-2.4.0) |
|---|
| | |
| skipping to change at line 27 | | skipping to change at line 27 |
|---|
| IBINDIR = -DBINDIR=\"@bindir@\" | | IBINDIR = -DBINDIR=\"@bindir@\" |
| ISYSCONFDIR = -DSYSCONFDIR=\"@sysconfdir@\" | | ISYSCONFDIR = -DSYSCONFDIR=\"@sysconfdir@\" |
| ISARGPHPDIR = -DSARGPHPDIR=\"@SARGPHPDIR@\" | | ISARGPHPDIR = -DSARGPHPDIR=\"@SARGPHPDIR@\" |
| IFONTDIR = -DFONTDIR=\"@FONTDIR@\" | | IFONTDIR = -DFONTDIR=\"@FONTDIR@\" |
| IIMAGEDIR = -DIMAGEDIR=\"@IMAGEDIR@\" | | IIMAGEDIR = -DIMAGEDIR=\"@IMAGEDIR@\" |
| ILOCALEDIR = -DLOCALEDIR=\"@localedir@\" | | ILOCALEDIR = -DLOCALEDIR=\"@localedir@\" |
| CFLAGS = @CFLAGS@ | | CFLAGS = @CFLAGS@ |
| CPPFLAGS = @CPPFLAGS@ | | CPPFLAGS = @CPPFLAGS@ |
| LDFLAGS = @LDFLAGS@ | | LDFLAGS = @LDFLAGS@ |
| DEFS = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR)
$(ILOCALEDIR) @DEFS@ | | DEFS = $(IBINDIR) $(ISYSCONFDIR) $(IFONTDIR) $(IIMAGEDIR) $(ISARGPHPDIR)
$(ILOCALEDIR) @DEFS@ |
|
| LIBS = @LIBS@ -lm | | LIBS = @LIBS@ @LIBINTL@ -lm |
| SRCDIR = . | | SRCDIR = . |
| VPATH = . | | VPATH = . |
| INSTALL = cp | | INSTALL = cp |
| XSL_MAN_STYLESHEET=@XSL_MAN_STYLESHEET@ | | XSL_MAN_STYLESHEET=@XSL_MAN_STYLESHEET@ |
| XSL_HTML_STYLESHEET=@XSL_HTML_STYLESHEET@ | | XSL_HTML_STYLESHEET=@XSL_HTML_STYLESHEET@ |
|
| | EXEEXT = @EXEEXT@ |
| | |
| INSTALL_PROGRAM = $(INSTALL) | | INSTALL_PROGRAM = $(INSTALL) |
| | |
| SRCS = util.c log.c report.c topuser.c email.c sort.c html.c \ | | 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 \ | | 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\ | | useragent.c exclude.c convlog.c totday.c repday.c datafile.c\ |
| indexonly.c splitlog.c lastlog.c topsites.c siteuser.c css.c \ | | indexonly.c splitlog.c lastlog.c topsites.c siteuser.c css.c \ |
| smartfilter.c denied.c authfail.c charset.c dichotomic.c \ | | smartfilter.c denied.c authfail.c dichotomic.c \ |
| redirector.c auth.c download.c grepday.c ip2name_exec.c \ | | redirector.c auth.c download.c grepday.c ip2name_exec.c \ |
| dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c \ | | dansguardian_log.c dansguardian_report.c realtime.c btree_cache.c \ |
| usertab.c userinfo.c longline.c url.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) | | OBJS = $(SRCS:.c=.o) |
| | |
| DISTFILES = $(SRCS) ABOUT-NLS | | DISTFILES = $(SRCS) ABOUT-NLS |
| | |
| SUBDIRS = po | | SUBDIRS = po |
| .PHONY: all install clean uninstall mostlyclean distclean update-po doc $(SUBDIR
S) | | .PHONY: all install clean uninstall mostlyclean distclean update-po doc $(SUBDIR
S) |
| | |
|
| all: sarg | | |
| | | |
| .c.o: | | .c.o: |
| $(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $< | | $(CC) -c -I. $(CPPFLAGS) $(DEFS) $(CFLAGS) $< |
| | |
|
| *.o: include/conf.h include/info.h include/defs.h | | |
| | | |
| sarg: $(OBJS) | | sarg: $(OBJS) |
| $(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS) $(LIBCRYPT) | | $(CC) $(LDFLAGS) $(OBJS) -o $@ $(LIBS) $(LIBCRYPT) |
| | |
| $(SUBDIRS): | | $(SUBDIRS): |
| $(MAKE) -C $@ | | $(MAKE) -C $@ |
| | |
| doc: sarg.1 sarg_manpage.html | | doc: sarg.1 sarg_manpage.html |
| | |
| sarg.1: sarg_manpage.xml | | sarg.1: sarg_manpage.xml |
| echo "Making manual page" | | echo "Making manual page" |
| | |
| skipping to change at line 95 | | skipping to change at line 113 |
|---|
| mkdir -p $(DESTDIR)$(man1dir); \ | | mkdir -p $(DESTDIR)$(man1dir); \ |
| fi | | fi |
| -@if test ! -d $(DESTDIR)$(sysconfdir); then \ | | -@if test ! -d $(DESTDIR)$(sysconfdir); then \ |
| echo "creating $(DESTDIR)$(sysconfdir)"; \ | | echo "creating $(DESTDIR)$(sysconfdir)"; \ |
| mkdir -p $(DESTDIR)$(sysconfdir); \ | | mkdir -p $(DESTDIR)$(sysconfdir); \ |
| fi | | fi |
| -@if test ! -d $(DESTDIR)$(IMAGEDIR); then \ | | -@if test ! -d $(DESTDIR)$(IMAGEDIR); then \ |
| echo "Creating $(DESTDIR)$(IMAGEDIR)"; \ | | echo "Creating $(DESTDIR)$(IMAGEDIR)"; \ |
| mkdir -p $(DESTDIR)$(IMAGEDIR); \ | | mkdir -p $(DESTDIR)$(IMAGEDIR); \ |
| fi | | fi |
|
| $(INSTALL_PROGRAM) sarg $(DESTDIR)$(bindir)/sarg | | $(INSTALL_PROGRAM) sarg$(EXEEXT) $(DESTDIR)$(bindir)/sarg$(EXEEXT); |
| chmod 755 $(DESTDIR)$(bindir)/sarg | | chmod 755 $(DESTDIR)$(bindir)/sarg$(EXEEXT); |
| $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(man1dir)/sarg.1 | | $(INSTALL_PROGRAM) sarg.1 $(DESTDIR)$(man1dir)/sarg.1 |
| chmod 755 $(DESTDIR)$(man1dir)/sarg.1 | | chmod 755 $(DESTDIR)$(man1dir)/sarg.1 |
| @if test ! -f $(DESTDIR)$(sysconfdir)/sarg.conf; then \ | | @if test ! -f $(DESTDIR)$(sysconfdir)/sarg.conf; then \ |
| echo "cp $(DESTDIR)$(sysconfdir)/sarg.conf"; \ | | echo "cp $(DESTDIR)$(sysconfdir)/sarg.conf"; \ |
| cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf; \ | | cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf; \ |
| else \ | | else \ |
| cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.default; \ | | cp sarg.conf $(DESTDIR)$(sysconfdir)/sarg.conf.default; \ |
| fi | | fi |
| cp ./exclude_codes $(DESTDIR)$(sysconfdir); | | cp ./exclude_codes $(DESTDIR)$(sysconfdir); |
| cp ./user_limit_block $(DESTDIR)$(sysconfdir); | | cp ./user_limit_block $(DESTDIR)$(sysconfdir); |
| | |
| skipping to change at line 139 | | skipping to change at line 157 |
|---|
| | |
| mostlyclean: clean | | mostlyclean: clean |
| | |
| distclean: clean | | distclean: clean |
| rm -f Makefile config.status config.cache config.log | | rm -f Makefile config.status config.cache config.log |
| | |
| realclean: distclean | | realclean: distclean |
| rm -f TAGS | | rm -f TAGS |
| | |
| install-po: | | install-po: |
|
| cd po ; $(MAKE) install | | $(MAKE) -C po install |
| | |
| uninstall-po: | | uninstall-po: |
|
| cd po ; $(MAKE) uninstall | | $(MAKE) -C po uninstall |
| | |
| clean-po: | | clean-po: |
|
| cd po ; $(MAKE) clean | | $(MAKE) -C po clean |
| | |
| update-po: | | update-po: |
|
| cd po ; $(MAKE) update-po | | $(MAKE) -C po update-po |
| | |
| po-from-tp: | | po-from-tp: |
| @echo "Fetching latest po files from translationprojetc.org" | | @echo "Fetching latest po files from translationprojetc.org" |
| rsync -Lrtvz -u translationproject.org::tp/latest/sarg/ po | | rsync -Lrtvz -u translationproject.org::tp/latest/sarg/ po |
| | | |
| End of changes. 10 change blocks. |
|---|
| 18 lines changed or deleted | | 36 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 