X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=GNUmakefile.in;h=78b44aa8e7127fe7a6e662bf6704c61c10cc887e;hp=fe61e6e810296fee051ef127ded4e684d17604a6;hb=712f52070112388ddfcdc059b54a76af3dbdf726;hpb=2e1c692a9dc98ba1a41eca617f7409e5472c9047 diff --git a/GNUmakefile.in b/GNUmakefile.in index fe61e6e8..78b44aa8 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.132 2002/10/24 22:24:58 hal9 Exp $ +# $Id: GNUmakefile.in,v 1.136 2002/12/28 04:10:21 david__schmidt Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -53,6 +53,7 @@ SNAPVERSION = $(RPM_VERSION)-$(shell date "+%Y%m%d") DIR_PRIVOXY_ROOT := . DIR_PRIVOXY_SRC := $(DIR_PRIVOXY_ROOT)/src DIR_PRIVOXY_SRC_PCRE := $(DIR_PRIVOXY_ROOT)/pcre +DIR_PRIVOXY_SRC_JAVA := $(DIR_PRIVOXY_ROOT)/src/java DIR_PRIVOXY_OBJ := $(DIR_PRIVOXY_ROOT)/obj ############################################################################# @@ -226,6 +227,10 @@ PCRE_SRC = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/get.c $(DIR_PRIVOXY_SRC PCRE_OBJS = @STATIC_PCRE_ONLY@$(PCRE_SRC:$(DIR_PRIVOXY_SRC_PCRE)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) PCRE_HDRS = @STATIC_PCRE_ONLY@$(DIR_PRIVOXY_SRC_PCRE)/config.h $(DIR_PRIVOXY_SRC_PCRE)/chartables.c $(DIR_PRIVOXY_SRC_PCRE)/internal.h $(DIR_PRIVOXY_SRC_PCRE)/pcre.h +ACTIVITY_SRC = @ACTIVITY_ONLY@$(DIR_PRIVOXY_SRC)/stats.c +ACTIVITY_OBJS = @ACTIVITY_ONLY@$(ACTIVITY_SRC:$(DIR_PRIVOXY_SRC)/%.c=$(DIR_PRIVOXY_OBJ)/%.@OBJEXT@) +ACTIVITY_HDRS = @ACTIVITY_ONLY@$(ACTIVITY_SRC:.c=.h) $(DIR_PRIVOXY_SRC)/ipc.h + # No REGEX (maybe because dynamically linked pcreposix): REGEX_SRC = @STATIC_PCRE_ONLY@REGEX_SRC = $(DIR_PRIVOXY_SRC_PCRE)/pcreposix.c @@ -242,9 +247,9 @@ SOCKET_LIB = @SOCKET_LIB@ # PThreads library, if needed. PTHREAD_LIB = @PTHREAD_ONLY@@PTHREAD_LIB@ -SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) -OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) -HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) +SRCS = $(C_SRC) $(W32_SRC) $(PCRS_SRC) $(PCRE_SRC) $(REGEX_SRC) $(ACTIVITY_SRC) +OBJS = $(C_OBJS) $(W32_OBJS) $(PCRS_OBJS) $(PCRE_OBJS) $(REGEX_OBJS) $(ACTIVITY_OBJS) +HDRS = $(C_HDRS) $(W32_HDRS) $(PCRS_HDRS) $(PCRE_OBJS) $(REGEX_HDRS) $(ACTIVITY_HDRS) LIBS = @LIBS@ $(W32_LIB) $(SOCKET_LIB) $(PTHREAD_LIB) @@ -283,7 +288,7 @@ all: $(PROGRAM) default.action suse-upload win-dist tarball-dist dok redhat-dok webserver clean clobber tags \ install conectiva-spec conectiva-dist conectiva-upload debian-dist \ debian-upload ensure-wdump ensure-jadebin ensure-dkprefix CONF_DEST LOG_DEST \ -PID_DEST check_doc install-strip uninstall GROUP_T +PID_DEST check_doc install-strip uninstall GROUP_T java-activity-console ############################################################################# @@ -681,6 +686,13 @@ tarball-upload: tarball-clean: $(RM) ../privoxy-$(VERSION)-$(CODE_STATUS)-src.tar.gz +############################################################################# +# java Activity Console +############################################################################# +java-activity-console: + javac -classpath $(DIR_PRIVOXY_SRC_JAVA):$(CLASSPATH) $(DIR_PRIVOXY_SRC)/java/org/privoxy/activityconsole/*.java + jar -cvfm ActivityConsole.jar $(DIR_PRIVOXY_SRC_JAVA)/org/privoxy/activityconsole/acon.manifest -C $(DIR_PRIVOXY_SRC_JAVA) org/privoxy/activityconsole + ############################################################################# # # Documentation @@ -872,28 +884,28 @@ install-strip: # Perhaps the whole user/group validation should be done here, and simplified. PROGRAM_V = Privoxy $(VERSION) install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T - # Quick test for valid USER. - if [ -n "$(USER)" ]; then \ + @# Quick test for valid USER. + @if [ -n "$(USER)" ]; then \ $(ID) $(USER) >/dev/null || exit 1;\ fi - # Test for valid group. FIXME. USER does not have to belong to GROUP - # for file ownership purposes. + @# Test for valid group. FIXME. USER does not have to belong to GROUP + @# for file ownership purposes. # if [ -n "$(GROUP_T)" ] && [ -n "$(USER)" ] && ! $(GROUPS) $(USER) | $(GREP) "\<$(GROUP_T)\>" >/dev/null; then \ # $(ECHO) Group $(GROUP_T) for User $(USER) is invalid && exit 1 ;\ # fi - $(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation" + @$(ECHO) "Creating directories, and preparing $(PROGRAM_V) installation" $(CHMOD) $(DIR_MODE) $(MKDIR) - $(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \ + @$(MKDIR) $(SBIN_DEST) $(prefix) $(CONF_DEST) $(CONF_DEST)/templates $(SHARE_DEST) \ $(LOG_DEST) $(PID_DEST) - # Install the executable binary, strip if invoked as install-strip - test -n "$(STRIP)" &&\ + @# Install the executable binary, strip if invoked as install-strip + @test -n "$(STRIP)" &&\ $(ECHO) Installing $(PROGRAM) stripped executable to $(SBIN_DEST) ||\ $(ECHO) Installing $(PROGRAM) executable to $(SBIN_DEST) $(INSTALL) $(INSTALL_P) $(STRIP) $(PROGRAM) $(SBIN_DEST) - # Install the DOCS and man page. install-sh only does one file at a time. - -if [ $(check_doc) = 0 ]; then \ + @# Install the DOCS and man page. install-sh only does one file at a time. + -@if [ $(check_doc) = 0 ]; then \ DOC=$(DOC_DEST) ;\ else \ DOC=$(prefix)/doc/privoxy ;\ @@ -918,13 +930,13 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(INSTALL) $(INSTALL_T) ChangeLog $$DOC;\ $(INSTALL) $(INSTALL_T) $(DOK_WEB)/p_doc.css $$DOC;\ fi - # Not all platforms support gzipped man pages. - $(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 + @# Not all platforms support gzipped man pages. + @$(ECHO) Installing man page to $(MAN_DEST)/privoxy.1 -$(INSTALL) $(INSTALL_T) privoxy.1 $(MAN_DEST)/privoxy.1 - # Change the config file default directories according to the configured ones - $(ECHO) Rewriting config for this installation - if [ -f config.base ] ; then \ + @# Change the config file default directories according to the configured ones + @$(ECHO) Rewriting config for this installation + @if [ -f config.base ] ; then \ $(CAT) config >config~ ;\ $(MV) config.base config ;\ fi @@ -933,18 +945,18 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T $(MV) config config.base $(MV) config.updated config - # Install the config support files. Test for root install, and abort - # if there is no privoxy user, and no other user was enabled during - # configure. Later, install init script if appropriate. - $(ECHO) Installing templates to $(CONF_DEST)/templates - for i in `find templates -type f`; do \ + @# Install the config support files. Test for root install, and abort + @# if there is no privoxy user, and no other user or group was enabled + @# during configure. + @$(ECHO) Installing templates to $(CONF_DEST)/templates + @for i in `find templates -type f`; do \ $(INSTALL) $(INSTALL_T) $$i $(CONF_DEST)/templates ;\ done - # FIXME: group/user validation is overly convoluted. - # If superuser install ... we require a minimum of group ownership - # of those files the daemon writes to, to be non-root owned. - if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\ + @# FIXME: group/user validation is overly convoluted. + @# If superuser install ... we require a minimum of group ownership + @# of those files the daemon writes to, to be non-root owned. + @if [ "`$(ID) |sed 's/(.*//' |sed 's/.*=//'`" = "0" ] ;then\ if [ x$(USER) = x ] || [ $(USER) = root ]; then \ if [ x$(GROUP) = x ] || [ $(GROUP) = root ]; then \ if [ "`$(ID) privoxy`" ] && \ @@ -1029,83 +1041,91 @@ install: CONF_DEST LOG_DEST PID_DEST check_doc GROUP_T else \ $(ECHO) "No init script installed, install it manually if needed" ;\ fi - # mmmmm, good. + @# mmmmm, good. @$(ECHO) "$(PROGRAM_V) installation succeeded!" @$(ECHO) "The Privoxy configuration files have been installed in $(CONF_DEST)" # rmdir is used as a precaution since it will not remove non-empty # directories. RH init script creates lock file and pid file. uninstall: CONF_DEST LOG_DEST PID_DEST check_doc - $(ECHO) Starting Privoxy uninstallation - # KILL privoxy if running - -if [ -f /etc/redhat-release ] && [ -x /etc/rc.d/init.d/privoxy ]; then \ + @$(ECHO) Starting Privoxy uninstallation + @# KILL privoxy if running + -@if [ -f /etc/redhat-release ] && [ -x /etc/rc.d/init.d/privoxy ]; then \ /etc/rc.d/init.d/privoxy stop >/dev/null 2>/dev/null ;\ chkconfig --del $(PROGRAM) 2>/dev/null;\ fi - -@ test -f $(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ - $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid` - -@ test -f /var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ - $(KILL) `$(CAT) /var/run/privoxy.pid ` + -@test -f $(PID_DEST)/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ + $(KILL) `$(CAT) $(PID_DEST)/privoxy.pid` || : + -@test -f /var/run/privoxy.pid && $(ECHO) Stopping $(PROGRAM) &&\ + $(KILL) `$(CAT) /var/run/privoxy.pid ` || : - # Program binary - $(ECHO) Removing $(PROGRAM) binary + @# Program binary + @$(ECHO) Removing $(PROGRAM) binary $(RM) $(SBIN_DEST)/$(PROGRAM) $(SBIN_DEST)/$(PROGRAM)~ - # config files and dir, and maybe old install backups - -if [ -d $(CONF_DEST) ]; then \ - $(ECHO) Saving $(PROGRAM) config files ;\ + @# config files and dir, and maybe old install backups + -@if [ -d $(CONF_DEST) ]; then \ + $(ECHO) Saving $(PROGRAM) config files to /tmp/$(PROGRAM)-save ;\ $(MKDIR) /tmp/$(PROGRAM)-save ;\ cd $(CONF_DEST) ;\ for i in $(CONFIGS); do \ - [ -f $$i ] && $(CP) -v $$i /tmp/$(PROGRAM)-save ;\ + [ -f $$i ] && $(CP) $$i /tmp/$(PROGRAM)-save ;\ done ;\ fi - $(ECHO) Removing $(PROGRAM) config files - for i in $(CONFIGS); do \ + @$(ECHO) Removing $(PROGRAM) config files + -@for i in $(CONFIGS); do \ + test -f $(CONF_DEST)/$$i && $(ECHO) Removing $$i ;\ $(RM) $(CONF_DEST)/$$i $(CONF_DEST)/$$i~ $(CONF_DEST)/$$i.new ;\ done - $(RM) -r $(CONF_DEST)/templates + -@test -d $(CONF_DEST)/templates && $(RM) -r $(CONF_DEST)/templates &&\ + $(ECHO) "Removing $(CONF_DEST)/templates/*" - # man page and docs - $(ECHO) Removing $(PROGRAM) docs + @# man page and docs + @$(ECHO) Removing $(PROGRAM) docs -$(RM) $(MAN_DEST)/privoxy.1* -$(RM) -r $(DOC_DEST) || $(RM) -r $(prefix)/doc/privoxy - # Log and jarfile and pidfile - $(ECHO) Removing $(PROGRAM) logs + @# Log and jarfile and pidfile + @$(ECHO) Removing $(PROGRAM) logs -$(RM) $(LOG_DEST)/logfile $(PID_DEST)/privoxy.pid $(LOG_DEST)/jarfile - # Final clean up of unused directories. Special handling of CONF and LOG + @# Final clean up of unused directories. Special handling of CONF and LOG # destinations. - $(ECHO) Removing $(PROGRAM) directories - for i in $(LOG_DEST) $(CONF_DEST); do \ + @$(ECHO) Removing $(PROGRAM) directories + @for i in $(LOG_DEST) $(CONF_DEST); do \ if test -d $$i; then \ + $(ECHO) Removing $$i ;\ $(RMDIR) $$i || $(ECHO) "$$i is not empty, not removed" ;\ fi;\ done - if [ ! "$(prefix)" = "/usr/local" ] ;then \ + @if [ ! "$(prefix)" = "/usr/local" ] ;then \ for i in $(MAN_DEST) $(MAN_DIR) $(SHARE_DEST)/doc $(SHARE_DEST) $(SBIN_DEST); do \ if test -d $$i; then \ + $(ECHO) Removing $$i ;\ $(RMDIR) $$i || $(ECHO) "$$i is not empty, not removed" ;\ fi;\ done;\ if test $(LOG_DEST) != /var/log/privoxy && test -d $(prefix)/var/log; then \ + $(ECHO) Removing $(prefix)/var/log ;\ $(RMDIR) $(prefix)/var/log || $(ECHO) "$(prefix)/var/log is not empty, not removed";\ fi ;\ if test $(PID_DEST) != /var/run && test -d $(prefix)/var/run; then \ + $(ECHO) Removing $(prefix)/var/run ;\ $(RMDIR) $(prefix)/var/run || $(ECHO) "$(prefix)/var/run is not empty, not removed";\ fi ;\ if test $(prefix)/var != /var && test -d $(prefix)/var; then \ + $(ECHO) Removing $(prefix)/var ;\ $(RMDIR) $(prefix)/var || $(ECHO) "$(prefix)/var is not empty, not removed" ;\ fi ;\ if test $(prefix) != / && test $(prefix) != /usr && test -d $(prefix); then \ + $(ECHO) Removing $(prefix) ;\ $(ECHO) Removing installation directory $(prefix) ;\ $(RMDIR) $(prefix) || $(ECHO) "$(prefix) is not empty, not removed" ;\ fi;\ fi - # init scripts and logrotate - if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ + @# init scripts and logrotate + @if [ "$(prefix)" = "/usr/local" ] || [ "$(prefix)" = "/usr" ]; then \ $(ECHO) Removing $(PROGRAM) init script ;\ if [ -f /etc/slackware-version ] && [ -d /etc/rc.d/ ] && [ -w /etc/rc.d/ ] ; then \ $(RM) /etc/rc.d/rc.privoxy ;\ @@ -1117,7 +1137,7 @@ uninstall: CONF_DEST LOG_DEST PID_DEST check_doc $(ECHO) "Unable to remove privoxy init script, not installed or permission denied" ;\ fi ;\ fi - $(ECHO) Privoxy uninstalled, bye + @$(ECHO) Privoxy uninstalled, bye coffee: @perl -e 'print pack "C*", (31,139,8,8,153,63,226,60,2,3,99,111,102,102,101,101,0,109,143,205,13,192,32,8,133,\ @@ -1133,6 +1153,25 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.136 2002/12/28 04:10:21 david__schmidt +# Initial drop of dashboard instrumentation - enabled with +# --enable-activity-console +# +# Revision 1.135 2002/11/04 05:11:05 hal9 +# Just a clean up of overly verbose output from install/uninstall. +# +# Revision 1.134 2002/10/28 06:01:39 hal9 +# Make uninstall: cp -v problems on SF Solaris. +# +# Revision 1.133 2002/10/28 02:12:22 hal9 +# Make install/uninstall: +# - More cleanup of variables +# - Make the minimum requirement for root install, an available non-root GROUP. +# If a privoxy user exists (and no other USER is specified), then the files +# that require write access are installed as group owned by privoxy. FIXME: +# There has to be a cleaner way to do this. +# - Uninstall now saves configuration files to /tmp. +# # Revision 1.132 2002/10/24 22:24:58 hal9 # Make install: Minor clean up for variable handling. #