Menu
▾
▴
bobs-cvs
|
From: Joe Z. <jz...@us...> - 2002-12-22 02:30:35
|
Update of /cvsroot/bobs/bobs
In directory sc8-pr-cvs1:/tmp/cvs-serv10619/bobs
Modified Files:
Makefile.am Makefile.in configure configure.in
Log Message:
Rewrite makefiles to use as much default processing as possible and
remove much custom code. There is now a Makefile.am in each subdirectory.
'make dist' now works.
Added option --with-crondir to help with rpm build. It uses DESTDIR
variable that rpm needs. The regular file backup.php is now put in the
cron directory instead of a link.
Index: Makefile.am
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am 1 Dec 2002 03:14:37 -0000 1.7
+++ Makefile.am 22 Dec 2002 02:30:31 -0000 1.8
@@ -1,5 +1,5 @@
## Process this file with automake to produce Makefile.in
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
## (this file is processed with 'automake' to produce Makefile.in)
## The '##' comments will not appear in the Makefile
@@ -10,34 +10,24 @@
## a fresh build.
## This is how I am currently building it:
## aclocal;automake --add-missing;autoconf;./configure
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+## 12-18-2002 Joe Zacky
+## Use the pre-defined variables and such as much as possible.
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Install these directories and files in the html dir.
-## Any new directories or files to be included in the
-## distribution must be specified here.
+# Subdirectories to also be built
+# Each subdirectory has it's own Makefile.am
-HTMLDIRS = cron htmlinc \
- images images/bar images/menu \
- inc inc/excludes inc/servers \
- inc/templates \
- js winc
+SUBDIRS = bash doc cron images inc js winc
-HTMLDOCS = *.php *.css \
- cron/backup.php \
- images/*.gif \
- images/bar/*.gif \
- images/menu/*.gif \
- images/menu/*.png \
- inc/*.php \
- inc/*.pinc \
- inc/*.ini \
- inc/excludes/default.excludelist \
- inc/servers/*.ini \
- inc/templates/*.php \
- inc/templates/*.sh \
- js/*.js \
- winc/*.php \
- winc/*.html
+# Install html documents.
+# By using a variable htmldir, ending in 'dir'
+# I can use variable html_DATA to install data to that directory
+
+htmldir = $(myWEBDIR)
+
+# The 'dist_' prefix tells 'make dist' to distribute these files.
+
+dist_html_DATA = *.php *.css
#
# Other files to be removed for maintainer (me)
@@ -51,11 +41,7 @@
install-sh \
aclocal.m4
-cvs-clean: distclean
- rm -rf auto*.cache
-
-maintainer-clean-local:
- rm -rf auto*.cache
+.PHONY: uninstall-all
install-data-local:
@@ -63,35 +49,9 @@
# This section contains things to do during 'make install'
#
-# Create html documents directory
-
- ./mkinstalldirs $(myWEBDIR)
-
-# Create the html directories in the location
-# specified by '--with-webdir=DIR'
-
- for dir in $(HTMLDIRS); do \
- ./mkinstalldirs $(myWEBDIR)/$$dir; \
- done
-
-# Copy the html documents to their final destination
-
- for file in $(HTMLDOCS); do \
- $(INSTALL_PROGRAM) $$file $(myWEBDIR)/$$file; \
- done
-
-# Put a link to backup.php in /etc/cron.daily
-
- ln -s $(myWEBDIR)/cron/backup.php /etc/cron.daily/backup.php
-
# Create bobs data directories
- ./mkinstalldirs $(myBOBSDATA)
- ./mkinstalldirs $(myBOBSDATA)/current
- ./mkinstalldirs $(myBOBSDATA)/current/process
- ./mkinstalldirs $(myBOBSDATA)/current/process/cmd
- ./mkinstalldirs $(myBOBSDATA)/current/process/mounts
- ./mkinstalldirs $(myBOBSDATA)/current/process/session
+ ./mkinstalldirs $(myBOBSDATA)/current/process/{cmd,mounts,session}
# httpd process must be able to write to bobs data dirs
# and some html directories,
@@ -102,60 +62,28 @@
chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
-# Install command processing program and check_loop
-
- $(INSTALL_PROGRAM) bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
- $(INSTALL_PROGRAM) cron/check_loop $(myBOBSDATA)/current/process/check_loop
+# Remove some other crap for 'make distclean'
+distclean-local:
+ rm -rf auto*.cache
+# not enuf auth rm -rf $(PACKAGE)-$(VERSION)
+ rm -f $(PACKAGE)-$(VERSION).tar.gz
#
-# This will remove all the install directories - empty or not.
+# Extra stuff to uninstall
#
-uninstall-all: uninstall
- rm -rf $(myWEBDIR)
- rm -rf $(myBOBSDATA)
-
uninstall-local:
-
-#
-# This section contains things to do during 'make uninstall'
-#
-
-# Remove the cron backup job
-
- rm -f /etc/cron.daily/backup.php
-
-# Remove the html documents by name
-# so I don't delete something unintentionally.
-
- for file in $(HTMLDOCS); do \
- rm -f $(myWEBDIR)/$$file; \
- done
-
-# Remove the html directories if they're empty.
-# Reverse sort dir names to remove lowest branches first.
-
- for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
- rmdir $(myWEBDIR)/$$dir; \
- done
-
-# Now remove the 'bobs' html directory
-
- rmdir $(myWEBDIR)
-
-# Remove the bobs data files
-# Only remove the ones that 'make install' put there
-
- rm -f $(myBOBSDATA)/current/process/cmdloop
- rm -f $(myBOBSDATA)/current/process/check_loop
-
-# Remove the bobs data directories if empty
-
- rmdir $(myBOBSDATA)/current/process/session
- rmdir $(myBOBSDATA)/current/process/mounts
- rmdir $(myBOBSDATA)/current/process/cmd
+ rmdir $(htmldir)
+ rmdir $(myBOBSDATA)/current/process/{cmd,mounts,session}
rmdir $(myBOBSDATA)/current/process
rmdir $(myBOBSDATA)/current
rmdir $(myBOBSDATA)
+
+#
+# This will remove all the install directories - empty or not.
+#
+uninstall-all:
+ rm -rf $(myWEBDIR)
+ rm -rf $(myBOBSDATA)
## END
Index: Makefile.in
===================================================================
RCS file: /cvsroot/bobs/bobs/Makefile.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.in 1 Dec 2002 03:14:37 -0000 1.4
+++ Makefile.in 22 Dec 2002 02:30:31 -0000 1.5
@@ -14,11 +14,12 @@
@SET_MAKE@
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
# auto makefile for the top-level bobs program
-# -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+#-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-# Install these directories and files in the html dir.
+# Subdirectories to also be built
+# Each subdirectory has it's own Makefile.am
SHELL = @SHELL@
srcdir = @srcdir@
@@ -80,34 +81,22 @@
am__quote = @am__quote@
install_sh = @install_sh@
myBOBSDATA = @myBOBSDATA@
+myCRONDIR = @myCRONDIR@
myHTTPDUSER = @myHTTPDUSER@
myPASS = @myPASS@
myWEBDIR = @myWEBDIR@
-HTMLDIRS = cron htmlinc \
- images images/bar images/menu \
- inc inc/excludes inc/servers \
- inc/templates \
- js winc
+SUBDIRS = bash doc cron images inc js winc
-HTMLDOCS = *.php *.css \
- cron/backup.php \
- images/*.gif \
- images/bar/*.gif \
- images/menu/*.gif \
- images/menu/*.png \
- inc/*.php \
- inc/*.pinc \
- inc/*.ini \
- inc/excludes/default.excludelist \
- inc/servers/*.ini \
- inc/templates/*.php \
- inc/templates/*.sh \
- js/*.js \
- winc/*.php \
- winc/*.html
+# Install html documents.
+# By using a variable htmldir, ending in 'dir'
+# I can use variable html_DATA to install data to that directory
+htmldir = $(myWEBDIR)
+
+# The 'dist_' prefix tells 'make dist' to distribute these files.
+dist_html_DATA = *.php *.css
#
@@ -124,12 +113,20 @@
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_CLEAN_FILES = inc/config.php cron/backup.php cron/check_loop
+CONFIG_CLEAN_FILES =
DIST_SOURCES =
-DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
- Makefile.in NEWS TODO aclocal.m4 configure configure.in \
- install-sh missing mkinstalldirs
-all: all-am
+DATA = $(dist_html_DATA)
+
+
+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 = README $(dist_html_DATA) AUTHORS COPYING ChangeLog \
+ INSTALL Makefile.am Makefile.in NEWS TODO aclocal.m4 configure \
+ configure.in install-sh missing mkinstalldirs
+DIST_SUBDIRS = $(SUBDIRS)
+all: all-recursive
.SUFFIXES:
@@ -148,16 +145,121 @@
$(ACLOCAL_M4): configure.in
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-inc/config.php: $(top_builddir)/config.status $(top_srcdir)/inc/config.php.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-cron/backup.php: $(top_builddir)/config.status $(top_srcdir)/cron/backup.php.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
-cron/check_loop: $(top_builddir)/config.status $(top_srcdir)/cron/check_loop.in
- cd $(top_builddir) && $(SHELL) ./config.status $@
uninstall-info-am:
+dist_htmlDATA_INSTALL = $(INSTALL_DATA)
+install-dist_htmlDATA: $(dist_html_DATA)
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(htmldir)
+ @list='$(dist_html_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " $(dist_htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f"; \
+ $(dist_htmlDATA_INSTALL) $$d$$p $(DESTDIR)$(htmldir)/$$f; \
+ done
+
+uninstall-dist_htmlDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(dist_html_DATA)'; for p in $$list; do \
+ f="`echo $$p | sed -e 's|^.*/||'`"; \
+ echo " rm -f $(DESTDIR)$(htmldir)/$$f"; \
+ rm -f $(DESTDIR)$(htmldir)/$$f; \
+ done
+
+# 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
+
+ETAGS = etags
+ETAGSFLAGS =
+
tags: TAGS
-TAGS:
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(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
+
+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) $(LISP) $(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)$$tags$$unique" \
+ || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__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 = .
@@ -195,6 +297,19 @@
|| exit 1; \
fi; \
done
+ list='$(SUBDIRS)'; for subdir in $$list; 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
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
@@ -248,20 +363,21 @@
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
-check: check-am
-all-am: Makefile
-
-installdirs:
+check: check-recursive
+all-am: Makefile $(DATA)
+installdirs: installdirs-recursive
+installdirs-am:
+ $(mkinstalldirs) $(DESTDIR)$(htmldir)
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-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-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
INSTALL_STRIP_FLAG=-s \
@@ -278,60 +394,64 @@
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
-clean: clean-am
+clean: clean-recursive
clean-am: clean-generic mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-distclean-am: clean-am distclean-generic
+distclean-am: clean-am distclean-generic distclean-local distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-info: info-am
+info: info-recursive
info-am:
-install-data-am: install-data-local
+install-data-am: install-data-local install-dist_htmlDATA
install-exec-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf autom4te.cache
-maintainer-clean-am: distclean-am maintainer-clean-generic \
- maintainer-clean-local
+maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic
-uninstall-am: uninstall-info-am uninstall-local
+uninstall-am: uninstall-dist_htmlDATA uninstall-info-am uninstall-local
-.PHONY: all all-am check check-am clean clean-generic dist dist-all \
- dist-gzip distcheck distclean distclean-generic distcleancheck \
- distdir dvi dvi-am info info-am install install-am install-data \
- install-data-am install-data-local install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- installcheck installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic maintainer-clean-local mostlyclean \
- mostlyclean-generic uninstall uninstall-am uninstall-info-am \
- uninstall-local
+uninstall-info: uninstall-info-recursive
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+ clean-generic clean-recursive dist dist-all dist-gzip distcheck \
+ distclean distclean-generic distclean-local distclean-recursive \
+ distclean-tags distcleancheck distdir dvi dvi-am dvi-recursive \
+ info info-am info-recursive install install-am install-data \
+ install-data-am install-data-local install-data-recursive \
+ install-dist_htmlDATA 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-dist_htmlDATA \
+ uninstall-info-am uninstall-info-recursive uninstall-local \
+ uninstall-recursive
-cvs-clean: distclean
- rm -rf auto*.cache
-maintainer-clean-local:
- rm -rf auto*.cache
+.PHONY: uninstall-all
install-data-local:
@@ -339,35 +459,9 @@
# This section contains things to do during 'make install'
#
-# Create html documents directory
-
- ./mkinstalldirs $(myWEBDIR)
-
-# Create the html directories in the location
-# specified by '--with-webdir=DIR'
-
- for dir in $(HTMLDIRS); do \
- ./mkinstalldirs $(myWEBDIR)/$$dir; \
- done
-
-# Copy the html documents to their final destination
-
- for file in $(HTMLDOCS); do \
- $(INSTALL_PROGRAM) $$file $(myWEBDIR)/$$file; \
- done
-
-# Put a link to backup.php in /etc/cron.daily
-
- ln -s $(myWEBDIR)/cron/backup.php /etc/cron.daily/backup.php
-
# Create bobs data directories
- ./mkinstalldirs $(myBOBSDATA)
- ./mkinstalldirs $(myBOBSDATA)/current
- ./mkinstalldirs $(myBOBSDATA)/current/process
- ./mkinstalldirs $(myBOBSDATA)/current/process/cmd
- ./mkinstalldirs $(myBOBSDATA)/current/process/mounts
- ./mkinstalldirs $(myBOBSDATA)/current/process/session
+ ./mkinstalldirs $(myBOBSDATA)/current/process/{cmd,mounts,session}
# httpd process must be able to write to bobs data dirs
# and some html directories,
@@ -378,60 +472,29 @@
chown -R $(myHTTPDUSER) $(myWEBDIR)/inc/servers; \
fi
-# Install command processing program and check_loop
+# Remove some other crap for 'make distclean'
- $(INSTALL_PROGRAM) bash/cmdloop $(myBOBSDATA)/current/process/cmdloop
- $(INSTALL_PROGRAM) cron/check_loop $(myBOBSDATA)/current/process/check_loop
+distclean-local:
+ rm -rf auto*.cache
+# not enuf auth rm -rf $(PACKAGE)-$(VERSION)
+ rm -f $(PACKAGE)-$(VERSION).tar.gz
#
-# This will remove all the install directories - empty or not.
+# Extra stuff to uninstall
#
-uninstall-all: uninstall
- rm -rf $(myWEBDIR)
- rm -rf $(myBOBSDATA)
-
uninstall-local:
-
-#
-# This section contains things to do during 'make uninstall'
-#
-
-# Remove the cron backup job
-
- rm -f /etc/cron.daily/backup.php
-
-# Remove the html documents by name
-# so I don't delete something unintentionally.
-
- for file in $(HTMLDOCS); do \
- rm -f $(myWEBDIR)/$$file; \
- done
-
-# Remove the html directories if they're empty.
-# Reverse sort dir names to remove lowest branches first.
-
- for dir in `echo $(HTMLDIRS) | tr ' ' '\n' | sort -r`; do \
- rmdir $(myWEBDIR)/$$dir; \
- done
-
-# Now remove the 'bobs' html directory
-
- rmdir $(myWEBDIR)
-
-# Remove the bobs data files
-# Only remove the ones that 'make install' put there
-
- rm -f $(myBOBSDATA)/current/process/cmdloop
- rm -f $(myBOBSDATA)/current/process/check_loop
-
-# Remove the bobs data directories if empty
-
- rmdir $(myBOBSDATA)/current/process/session
- rmdir $(myBOBSDATA)/current/process/mounts
- rmdir $(myBOBSDATA)/current/process/cmd
+ rmdir $(htmldir)
+ rmdir $(myBOBSDATA)/current/process/{cmd,mounts,session}
rmdir $(myBOBSDATA)/current/process
rmdir $(myBOBSDATA)/current
rmdir $(myBOBSDATA)
+
+#
+# This will remove all the install directories - empty or not.
+#
+uninstall-all:
+ rm -rf $(myWEBDIR)
+ rm -rf $(myBOBSDATA)
# 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:
Index: configure
===================================================================
RCS file: /cvsroot/bobs/bobs/configure,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- configure 1 Dec 2002 03:10:29 -0000 1.3
+++ configure 22 Dec 2002 02:30:31 -0000 1.4
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53.
+# Generated by GNU Autoconf 2.53 for bobs 0.5.1.
#
# Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
# Free Software Foundation, Inc.
@@ -252,11 +252,11 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='bobs'
+PACKAGE_TARNAME='bobs'
+PACKAGE_VERSION='0.5.1'
+PACKAGE_STRING='bobs 0.5.1'
+PACKAGE_BUGREPORT=''
ac_unique_file="admin.php"
@@ -703,7 +703,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures bobs 0.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -764,14 +764,17 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of bobs 0.5.1:";;
+ esac
cat <<\_ACEOF
Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
- --with-webdir=DIR Place the bobs web pages in DIR
- --with-bobsdata=DIR Place the bobs data (backups) in DIR
+ --with-webdir=DIR Place the bobs web pages in DIR
+ --with-bobsdata=DIR Place the bobs data (backups) in DIR
+ --with-crondir=DIR Location of cron.daily directory
_ACEOF
fi
@@ -835,6 +838,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+bobs configure 0.5.1
+generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
Free Software Foundation, Inc.
@@ -848,7 +853,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by bobs $as_me 0.5.1, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -1118,6 +1123,15 @@
+
+
+
+
+
+
+
+
+
am__api_version="1.6"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1499,6 +1513,36 @@
+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.make <<\_ACEOF
+all:
+ @echo 'ac_maketemp="${MAKE}"'
+_ACEOF
+# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
+if test -n "$ac_maketemp"; then
+ eval ac_cv_prog_make_${ac_make}_set=yes
+else
+ eval ac_cv_prog_make_${ac_make}_set=no
+fi
+rm -f conftest.make
+fi
+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ SET_MAKE=
+else
+ echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+ SET_MAKE="MAKE=${MAKE-make}"
+fi
+
+
WARNCOUNT=0
@@ -1575,6 +1619,16 @@
fi;
+
+# Check whether --with-crondir or --without-crondir was given.
+if test "${with_crondir+set}" = set; then
+ withval="$with_crondir"
+ myCRONDIR=${DESTDIR}${with_crondir}
+else
+ myCRONDIR=${DESTDIR}/etc/cron.daily
+fi;
+
+
echo "$as_me:$LINENO: checking for web server user id" >&5
echo $ECHO_N "checking for web server user id... $ECHO_C" >&6
@@ -1602,7 +1656,13 @@
-ac_config_files="$ac_config_files Makefile inc/config.php cron/backup.php cron/check_loop"
+
+
+
+ac_config_files="$ac_config_files Makefile bash/Makefile cron/Makefile doc/Makefile images/Makefile images/bar/Makefile images/menu/Makefile inc/Makefile inc/Makefile inc/excludes/Makefile inc/servers/Makefile inc/templates/Makefile js/Makefile winc/Makefile"
+
+
+ac_config_files="$ac_config_files inc/config.php cron/backup.php cron/check_loop"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -1959,7 +2019,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by bobs $as_me 0.5.1, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2013,7 +2073,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+bobs config.status 0.5.1
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
@@ -2101,6 +2161,19 @@
case "$ac_config_target" in
# Handling of arguments.
"Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "bash/Makefile" ) CONFIG_FILES="$CONFIG_FILES bash/Makefile" ;;
+ "cron/Makefile" ) CONFIG_FILES="$CONFIG_FILES cron/Makefile" ;;
+ "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
+ "images/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/Makefile" ;;
+ "images/bar/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/bar/Makefile" ;;
+ "images/menu/Makefile" ) CONFIG_FILES="$CONFIG_FILES images/menu/Makefile" ;;
+ "inc/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;;
+ "inc/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/Makefile" ;;
+ "inc/excludes/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/excludes/Makefile" ;;
+ "inc/servers/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/servers/Makefile" ;;
+ "inc/templates/Makefile" ) CONFIG_FILES="$CONFIG_FILES inc/templates/Makefile" ;;
+ "js/Makefile" ) CONFIG_FILES="$CONFIG_FILES js/Makefile" ;;
+ "winc/Makefile" ) CONFIG_FILES="$CONFIG_FILES winc/Makefile" ;;
"inc/config.php" ) CONFIG_FILES="$CONFIG_FILES inc/config.php" ;;
"cron/backup.php" ) CONFIG_FILES="$CONFIG_FILES cron/backup.php" ;;
"cron/check_loop" ) CONFIG_FILES="$CONFIG_FILES cron/check_loop" ;;
@@ -2203,6 +2276,7 @@
s,@SET_MAKE@,$SET_MAKE,;t t
s,@myWEBDIR@,$myWEBDIR,;t t
s,@myBOBSDATA@,$myBOBSDATA,;t t
+s,@myCRONDIR@,$myCRONDIR,;t t
s,@myPASS@,$myPASS,;t t
s,@myHTTPDUSER@,$myHTTPDUSER,;t t
CEOF
@@ -2439,6 +2513,7 @@
Your configuration:
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ cron directory = $myCRONDIR
admin password = $myPASS
*** $WARNCOUNT warning(s)
Index: configure.in
===================================================================
RCS file: /cvsroot/bobs/bobs/configure.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- configure.in 1 Dec 2002 03:10:29 -0000 1.5
+++ configure.in 22 Dec 2002 02:30:32 -0000 1.6
@@ -5,6 +5,11 @@
dnl> 11-30-2002 Remove program checks. They no longer work right.
dnl> They should be done in 'make check' anyway.
dnl> 11-30-2002 Default admin password to 'admin'.
+dnl> 12-21-2002 Rewrite Makefiles to use SUBDIRS and as much
+dnl> default processing as possible.
+dnl> Get 'make dist' to work.
+dnl> This is how I am currently building the package:
+dnl> aclocal;autoconf;automake --add-missing;./configure
PACKAGE=bobs
VERSION=0.5.1
@@ -13,8 +18,12 @@
dnl> Verify we're in the right directory by looking for a unique file.
dnl>
-AC_INIT(admin.php)
-AM_INIT_AUTOMAKE(bobs, 0.5.1)
+AC_INIT(bobs, 0.5.1)
+AC_CONFIG_SRCDIR(admin.php)
+AM_INIT_AUTOMAKE
+
+dnl> Needed for SUBDIRS variable in Makefile.in
+AC_PROG_MAKE_SET
WARNCOUNT=0
@@ -23,7 +32,7 @@
dnl> If not specified --with-webdir, then look for the http root.
dnl>
-AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
+AC_ARG_WITH(webdir,[ --with-webdir=DIR Place the bobs web pages in DIR],
myWEBDIR=${DESTDIR}$with_webdir/bobs,
[
AC_CHECK_FILE(/home/httpd/html,myDOCUMENTROOT=/home/httpd/html)
@@ -43,10 +52,19 @@
dnl> then default to /var/bobsdata.
dnl>
-AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
+AC_ARG_WITH(bobsdata,[ --with-bobsdata=DIR Place the bobs data (backups) in DIR ],
myBOBSDATA=${DESTDIR}${with_bobsdata}/bobsdata, myBOBSDATA=${DESTDIR}/var/bobsdata )
dnl>
+dnl> Set the location of the cron.daily directory
+dnl> If not specified with '--with-crondir=DIR',
+dnl> then default to /etc/cron.daily
+dnl>
+
+AC_ARG_WITH(crondir,[ --with-crondir=DIR Location of cron.daily directory ],
+ myCRONDIR=${DESTDIR}${with_crondir}, myCRONDIR=${DESTDIR}/etc/cron.daily )
+
+dnl>
dnl> Try to determine the user id of the web server.
dnl>
@@ -75,15 +93,34 @@
AC_SUBST(myWEBDIR)
AC_SUBST(myBOBSDATA)
+AC_SUBST(myCRONDIR)
AC_SUBST(myPASS)
AC_SUBST(myHTTPDUSER)
+AC_SUBST(PACKAGE)
+AC_SUBST(VERSION)
dnl>
dnl> These are the files that will be created from their '.in' versions.
dnl>
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
+bash/Makefile
+cron/Makefile
+doc/Makefile
+images/Makefile
+images/bar/Makefile
+images/menu/Makefile
+inc/Makefile
+inc/Makefile
+inc/excludes/Makefile
+inc/servers/Makefile
+inc/templates/Makefile
+js/Makefile
+winc/Makefile
+])
+
+AC_OUTPUT([
inc/config.php
cron/backup.php
cron/check_loop
@@ -98,6 +135,7 @@
Your configuration:
web pages directory = $myWEBDIR
bobs data directory = $myBOBSDATA
+ cron directory = $myCRONDIR
admin password = $myPASS
*** $WARNCOUNT warning(s)
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X