Skip to content

Commit ae80094

Browse files
committed
Remove cleandb makefile target
The cleandb target is obsolete, remove it from the parent makefile and all subdirectory makefiles.
1 parent 5991c9e commit ae80094

12 files changed

+0
-56
lines changed

Makefile.am

-11
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,3 @@
22

33
SUBDIRS = etc lib portal kmtool sr \
44
ca openid bin sbin ch man doc
5-
6-
## In more modern versions of automake we can use
7-
## AM_EXTRA_RECURSIVE_TARGETS in configure.ac to create a recursive
8-
## cleandb target. This is a poor man's substitute that will suffice
9-
## on older versions of automake.
10-
cleandb:
11-
@$(MAKE) $(SUBDIRS) TARG=$@
12-
$(SUBDIRS)::
13-
@cd $@; echo making $(TARG) in $@...; \
14-
$(MAKE) $(TARG)
15-
.PHONY: $(SUBDIRS)

bin/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,3 @@ endif
3737

3838
localpythondir = $(subst /usr/lib,/usr/local/lib,$(pythondir))
3939
nobase_dist_localpython_DATA = portal_utils/__init__.py portal_utils/orbit_interface.py
40-
41-
cleandb:

ca/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,3 @@ $(SERIAL_FILE):
2525

2626
$(INDEX_FILE):
2727
$(INSTALL_WWW) -m 644 /dev/null $(INDEX_FILE)
28-
29-
# empty target for compatibility
30-
cleandb:

ch/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,3 @@ nobase_dist_svcdata_DATA = \
55
www/index.html \
66
www/favicon.ico \
77
www/cainfo.html
8-
9-
# "cleandb" target is for compatibility, but nothing to do here.
10-
cleandb:

doc/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
11
info_TEXINFOS = geni-portal.texi
2-
3-
cleandb:

etc/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,3 @@ dist_pkgsysconf_DATA = \
3434
pkgsysconf_DATA = \
3535
ch-services.ini \
3636
example-services.ini
37-
38-
cleandb:

kmtool/Makefile.am

-11
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,3 @@ dist_svcweb_DATA = \
2121
www/kmtool/renewcert.php
2222

2323
dist_svccss_DATA = www/common/css/kmtool.css
24-
25-
# To do: transition database initialization to a script using
26-
# the installed schema and data SQL files.
27-
PSQL = /usr/bin/psql
28-
DB.USER = portal
29-
DB.HOST = localhost
30-
DB.DB = portal
31-
SCHEMA.SQL = db/postgresql/schema.sql
32-
33-
cleandb:
34-
$(PSQL) -U $(DB.USER) -h $(DB.HOST) -f $(SCHEMA.SQL) $(DB.DB)

lib/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -96,5 +96,3 @@ nobase_dist_svcdata_DATA = \
9696
php/user.php \
9797
php/user-preferences.php \
9898
php/util.php
99-
100-
cleandb:

man/Makefile.am

-1
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,3 @@ dist_man_MANS = \
44
geni-parse-map-data.1 \
55
geni-sync-wireless.1 \
66
geni-watch-omni.1
7-
cleandb:

openid/Makefile.am

-3
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,3 @@ dist_svcdata_DATA = \
8686
# There are config.php files in the server-[in]direct directories.
8787
#pkgsysconfdir = $(sysconfdir)/geni-ch/openid
8888
#nobase_dist_pkgsysconf_DATA = etc/config.php.tmpl
89-
90-
# For compatibility
91-
cleandb:

portal/Makefile.am

-14
Original file line numberDiff line numberDiff line change
@@ -427,17 +427,3 @@ dist_svcwebpolicy_DATA = \
427427
# Note: this requirs AC_PROG_MKDIR_P in configure.ac
428428
install-data-local:
429429
$(MKDIR_P) $(svcdatadir)/gcf.d/trusted_roots
430-
431-
432-
# To do: transition database initialization to a script using
433-
# the installed schema and data SQL files.
434-
PSQL = /usr/bin/psql
435-
DB.USER = portal
436-
DB.HOST = localhost
437-
DB.DB = portal
438-
SCHEMA.SQL = db/postgresql/schema.sql
439-
DATA.SQL = db/postgresql/data.sql
440-
441-
cleandb:
442-
$(PSQL) -U $(DB.USER) -h $(DB.HOST) -f $(SCHEMA.SQL) $(DB.DB)
443-
$(PSQL) -U $(DB.USER) -h $(DB.HOST) -f $(DATA.SQL) $(DB.DB)

sbin/Makefile.am

-2
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,3 @@ dist_sbin_SCRIPTS = \
3434
update_user_certs.py \
3535
gen-drop-constraints.sql \
3636
gen-add-constraints.sql
37-
38-
cleandb:

0 commit comments

Comments
 (0)