X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=Makefile.in;h=551a6d92946ed3625a5e9261d148a478100cd1fa;hb=f47f78de590c5ae21f7e25c00549e6ed2e3bfabb;hp=888e0b512f0bf73d1577dd31ab8335990df68960;hpb=e1cb16044e0d5ff5f2545f1e081c04824348e0e2;p=privoxy.git diff --git a/Makefile.in b/Makefile.in index 888e0b51..551a6d92 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: Makefile.in,v 1.29 2001/09/16 17:34:27 jongfoster Exp $ +# $Id: Makefile.in,v 1.34 2001/10/15 18:28:06 steudten Exp $ # # Written by and Copyright (C) 2001 the SourceForge # IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,24 @@ # Temple Place - Suite 330, Boston, MA 02111-1307, USA. # # $Log: Makefile.in,v $ +# Revision 1.34 2001/10/15 18:28:06 steudten +# remove config.cache for target clobber. +# Cleanup make dist for RH and S.u.S.E. +# +# Revision 1.33 2001/10/10 12:43:33 oes +# Added ugly hack to make install target work at least for some setups. +# +# Revision 1.32 2001/10/09 22:38:19 jongfoster +# Correcting actionsfile filename for Win32 INI build +# +# Revision 1.31 2001/09/23 10:13:48 swa +# upload process established. run make webserver and +# the documentation is moved to the webserver. documents +# are now linked correctly. +# +# Revision 1.30 2001/09/19 17:55:49 oes +# Fixed CFLAGS +# # Revision 1.29 2001/09/16 17:34:27 jongfoster # Removing showargs.[ch], adding cgi(simple|edit).[ch] # Replacing $(OBJEXT) with @OBJEXT@ - this seems to be a common source @@ -284,7 +302,7 @@ junkbstr.txt: config -e 's!#Win32-only: !!' \ < $< > $@ -sactions.txt: actionslist +sactions.txt: actionsfile strust.txt: trust sregexp.txt: re_filterfile @@ -298,7 +316,7 @@ redhat-dist: # verify that i'm root needs to be done rm -f ../ijbswa.tar.gz # verify all version strings, FLAGS, etc. in the spec file - cat junkbuster-rh.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-rh.spec + cat junkbuster-rh.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && mv -f abc junkbuster-rh.spec tar --exclude "CVS" --exclude "junkbuster-suse.spec" -cvzf ../ijbswa.tar.gz . # verify all files in their correct location needs to be done cd .. && rpm -ta ijbswa.tar.gz @@ -313,7 +331,7 @@ suse-dist: # verify that i'm root needs to be done rm -f ../ijbswa.tar.gz # verify all version strings, FLAGS, etc. in the spec file - cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > /tmp/abc && cp -f /tmp/abc junkbuster-suse.spec + cat junkbuster-suse.spec | sed 's/^Version:.*/Version: $(RPM_VERSION)/g' | sed 's/^Release:.*/Release: $(RPM_PACKAGEV)/g' > abc && mv -f abc junkbuster-suse.spec tar --exclude "CVS" --exclude "junkbuster-rh.spec" -cvzf ../ijbswa.tar.gz . # verify all files in their correct location needs to be done # never use buildroot to define the location inside the spec @@ -370,6 +388,22 @@ dok: cd doc/source && db2html -s ldp.dsl faq.sgml && mv faq ../webserver cd doc/source && db2html -s ldp.dsl --nochunks faq.sgml > tmp.html && lynx -dump tmp.html > ../text/faq.txt && rm -rf tmp.html faq +############################################################################# +# +# Webserver +# +# moves dokumentation to webserver +# +############################################################################# +webserver: + $(ECHO) ------------------------------------------------------- + $(ECHO) You have run make dok before, right? + $(ECHO) Note that this command scps all stuff to the webserver, + $(ECHO) it will not remove obsolete documents. + $(ECHO) ------------------------------------------------------- + chmod -R a+r doc/webserver + find doc/webserver -type d -exec chmod a+rx {} \; + cd doc/webserver && scp -Cr . ijbswa.sourceforge.net:/home/groups/i/ij/ijbswa/htdocs/ ############################################################################# # Source file dependencies @@ -425,7 +459,7 @@ w32.res: w32.rc w32res.h icons/ico00001.ico icons/ico00002.ico icons/ico00003.ic # AmigaOS @AMIGAOS_ONLY@OBJS += amiga.o -@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -Wall -m68020 -Os -noixemul -fbaserel -msmall-code +@AMIGAOS_ONLY@CFLAGS += -D__AMIGAVERSION__=\"$(VERSION_MAJOR).$(VERSION_MINOR)$(VERSION_POINT)\" -D__AMIGADATE__=\"`date +%d.%m.%Y`\" -W -m68020 -noixemul -fbaserel -msmall-code @AMIGAOS_ONLY@LDFLAGS += -m68020 -noixemul -fbaserel @AMIGAOS_ONLY@LIBS = -lm /gg/lib/libb/libm020/libnix/swapstack.o @AMIGAOS_ONLY@amiga.o: amiga.c amiga.h config.h @@ -438,21 +472,27 @@ clean: $(RM) a.out core $(OBJS) $(W32_FILES) $(W32_INIS) clobber: clean - $(RM) $(PROGRAM) *.pdb *.lib *.exp TAGS junkbuster.log + $(RM) $(PROGRAM) *.pdb *.lib *.exp TAGS junkbuster.log config.cache tags: $(SRCS) $(HDRS) etags $(SRCS) $(HDRS) install: all + # + # FIXME: This is a dirty hack to have an install target + # that works at least for some setups. This needs + # to be fixed! + # $(STRIP_PROG) $(PROGRAM) $(INSTALL) $(PROGRAM) $(SBIN_DEST) - $(INSTALL) README README.TOO README.WIN README.re_filter README.cygwin $(DEST) - $(INSTALL) aclfile blocklist config cookiefile forward imagelist \ - popup re_filterfile trust $(DEST) - # FIXME: On SuSE, these are not found. Where do they go? - $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly - $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz - $(INSTALL) junkbuster.init /sbin/init.d/junkbuster + mkdir -p $(DEST)/user-manual + mkdir -p $(DEST)/templates + cp -r doc/webserver/user-manual $(DEST) + cp -r templates $(DEST) + $(INSTALL) config actionsfile re_filterfile trust $(DEST) + # FIXME $(ECHO) junkbuster.logrotate junkbuster.monthly junkbuster.weekly + # FIXME: Need new manual! $(GZIP_PROG) -c junkbuster.1 > $(MAN_DEST)/junkbuster.1.gz + $(INSTALL) junkbuster.init /etc/init.d/junkbuster #############################################################################