[vhffs-dev] [1127] First commit in order to have a working make distcheck...

[subversion@xxxxxxxxxxxxx]

Revision: 1127
Author:   beuss
Date:     2008-01-10 22:29:44 +0000 (Thu, 10 Jan 2008)

Log Message:
-----------
First commit in order to have a working make distcheck...
Please donate to vhffs so you can buy an "I love autools" T-shirt.

Modified Paths:
--------------
    trunk/configure.ac
    trunk/vhffs-api/src/Vhffs/Makefile.am
    trunk/vhffs-api/src/examples/Makefile.am
    trunk/vhffs-backend/Makefile.am
    trunk/vhffs-backend/src/Makefile.am
    trunk/vhffs-compat/Makefile.am
    trunk/vhffs-doc/Makefile.am
    trunk/vhffs-fs/Makefile.am
    trunk/vhffs-jabber/Makefile.am
    trunk/vhffs-listengine/src/Makefile.am
    trunk/vhffs-panel/Makefile.am
    trunk/vhffs-panel/templates/Makefile.am
    trunk/vhffs-public/Makefile.am
    trunk/vhffs-public/templates/Makefile.am
    trunk/vhffs-robots/Makefile.am
    trunk/vhffs-tests/src/Makefile.am
    trunk/vhffs-themes/Makefile.am
    trunk/vhffs-tools/src/Makefile.am

Added Paths:
-----------
    trunk/vhffs-tools/mans/Makefile.am

Removed Paths:
-------------
    trunk/vhffs-fs/rpcgen.sh

Property Changed:
----------------
    trunk/vhffs-tools/mans/


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/configure.ac	2008-01-10 22:29:44 UTC (rev 1127)
@@ -315,6 +315,7 @@
 	vhffs-themes/Makefile
 	vhffs-tools/Makefile
 	vhffs-tools/src/Makefile
+    vhffs-tools/mans/Makefile
 	],
 )
 

Modified: trunk/vhffs-api/src/Vhffs/Makefile.am
===================================================================
--- trunk/vhffs-api/src/Vhffs/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-api/src/Vhffs/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -3,7 +3,7 @@
 revision=`svnversion . | perl -e '$$_ = <STDIN>; /^(?:.*?:)?(\d+)\w*\$$/; print \$$1;'`
 botsdir = @BOTSDIR@
 
-nobase_api_DATA = \
+nobase_dist_api_DATA = \
 	Acl.pm \
 	Conf.pm \
 	Constants.pm \

Modified: trunk/vhffs-api/src/examples/Makefile.am
===================================================================
--- trunk/vhffs-api/src/examples/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-api/src/examples/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,4 +1,4 @@
-examples_SCRIPTS = \
+dist_examples_SCRIPTS = \
 	add_acl_dns.pl \
 	add_acl.pl \
 	create_box.pl \

Modified: trunk/vhffs-backend/Makefile.am
===================================================================
--- trunk/vhffs-backend/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-backend/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -3,7 +3,7 @@
 SUBDIRS=src
 
 # If you add files to this, you've to modify install-data-hook
-config_DATA = conf/vhffs.conf.dist
+dist_config_DATA = conf/vhffs.conf.dist
 configdir = @CONFDIR@
 CONF_FILE = @CONFDIR@/vhffs.conf
 

Modified: trunk/vhffs-backend/src/Makefile.am
===================================================================
--- trunk/vhffs-backend/src/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-backend/src/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,11 +1,11 @@
 mirrordir=@BACKENDDIR@
 
-nobase_mirror_SCRIPTS = mirror/mx1-mirror.pl \
+nobase_dist_mirror_SCRIPTS = mirror/mx1-mirror.pl \
 						mirror/mx2-mirror.pl \
 						mirror/mydns-mirror.pl \
 						mirror/nss-mirror.pl
 
-nobase_mirror_DATA = 	mirror/mx1-mirror.sql \
+nobase_dist_mirror_DATA = 	mirror/mx1-mirror.sql \
 						mirror/mx2-mirror.sql \
 						mirror/mydns-mirror.sql
 

Modified: trunk/vhffs-compat/Makefile.am
===================================================================
--- trunk/vhffs-compat/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-compat/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,11 +1,11 @@
 if INSTALL_COMPAT
 
 compatdir = @COMPATDIR@
-compat_DATA = \
+dist_compat_DATA = \
 	4.0pre1.sql \
 	4.0.sql
 
-compat_SCRIPTS = \
+dist_compat_SCRIPTS = \
 	updatedb.pl \
 	fix-home-perms.sh
 

Modified: trunk/vhffs-doc/Makefile.am
===================================================================
--- trunk/vhffs-doc/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-doc/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -3,9 +3,7 @@
 
 languages = fr
 
-doc_DATA = 
-	
-nobase_doc_DATA = \
+nobase_dist_doc_DATA = \
 	config/apache/panelconf \
 	config/exim4-mx1/exim4.conf \
 	config/exim4-mx2/exim4.conf \

Modified: trunk/vhffs-fs/Makefile.am
===================================================================
--- trunk/vhffs-fs/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-fs/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,9 +1,9 @@
 vhffsfsdir=@VHFFSFSDIR@
-vhffsfs_SOURCES=md5c.c vhffsfs.c rquota_xdr.c rquota_clnt.c
+vhffsfs_SOURCES=md5c.c vhffsfs.c rquota_xdr.c rquota_clnt.c rquota.h
 vhffsfs_PROGRAMS=vhffsfs
 
 vhffsfsconfdir=@CONFDIR@
-vhffsfsconf_DATA=vhffsfs.conf.dist
+dist_vhffsfsconf_DATA=vhffsfs.conf.dist
 CONF_FILE=@CONFDIR@/vhffsfs.conf
 
 install-data-hook:
@@ -14,3 +14,14 @@
         $(INSTALL_DATA) $(vhffsfsconf_DATA) $(DESTDIR)$(CONF_FILE); \
     fi
 
+
+rquota_xdr.c: rquota.x
+	rpcgen -c -o rquota_xdr.c rquota.x
+
+rquota_clnt.c: rquota.x
+	rpcgen -l -o rquota_clnt.c rquota.x
+
+rquota.h: rquota.x
+	rpcgen -h -o rquota.h rquota.x
+
+CLEANFILES=rquota_xdr.c rquota_clnt.c rquota.h

Deleted: trunk/vhffs-fs/rpcgen.sh
===================================================================
--- trunk/vhffs-fs/rpcgen.sh	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-fs/rpcgen.sh	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,3 +0,0 @@
-rpcgen -h -o rquota.h rquota.x
-rpcgen -c -o rquota_xdr.c rquota.x
-rpcgen -l -o rquota_clnt.c rquota.x

Modified: trunk/vhffs-jabber/Makefile.am
===================================================================
--- trunk/vhffs-jabber/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-jabber/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,7 +1,7 @@
 if INSTALL_JABBER
 
 jabberdir = @JABBERDIR@
-jabber_SCRIPTS = vhffspipe.pl
+dist_jabber_SCRIPTS = vhffspipe.pl
 
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \

Modified: trunk/vhffs-listengine/src/Makefile.am
===================================================================
--- trunk/vhffs-listengine/src/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-listengine/src/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,5 +1,5 @@
 ledir = @LEDIR@
-le_SCRIPTS = listengine.pl
+dist_le_SCRIPTS = listengine.pl
 
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \

Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-panel/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -7,10 +7,10 @@
 SUBDIRS = templates
 
 paneljsdir= @PANELDIR@
-nobase_paneljs_DATA = $(javascripts)
+nobase_dist_paneljs_DATA = $(javascripts)
 
 paneldir = @PANELDIR@
-nobase_panel_SCRIPTS = alert_submit.pl \
+nobase_dist_panel_SCRIPTS = alert_submit.pl \
 	alert.pl \
 	auth.pl \
 	auth.pl \
@@ -144,7 +144,7 @@
 
 if INSTALL_PUBLIC
 publicjsdir = @PUBLICDIR@
-nobase_publicjs_DATA = $(javascripts)
+nobase_dist_publicjs_DATA = $(javascripts)
 endif
 
 

Modified: trunk/vhffs-panel/templates/Makefile.am
===================================================================
--- trunk/vhffs-panel/templates/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-panel/templates/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,5 +1,5 @@
 paneltemplatesdir = @TEMPLATESDIR@/panel
-nobase_paneltemplates_DATA = \
+nobase_dist_paneltemplates_DATA = \
 	acl/view.tmpl \
 	admin/index.tmpl \
 	admin/cvs/part.tmpl \

Modified: trunk/vhffs-public/Makefile.am
===================================================================
--- trunk/vhffs-public/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-public/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -2,7 +2,7 @@
 SUBDIRS = templates
 
 publicdir = @PUBLICDIR@
-nobase_public_SCRIPTS = \
+nobase_dist_public_SCRIPTS = \
 	allgroups.pl \
 	allwebsites.pl \
 	getavatar.pl \

Modified: trunk/vhffs-public/templates/Makefile.am
===================================================================
--- trunk/vhffs-public/templates/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-public/templates/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,5 +1,5 @@
 publictemplatesdir = @TEMPLATESDIR@/public
-nobase_publictemplates_DATA = \
+nobase_dist_publictemplates_DATA = \
 	banner.tmpl \
 	group_part.tmpl \
 	group.tmpl \

Modified: trunk/vhffs-robots/Makefile.am
===================================================================
--- trunk/vhffs-robots/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-robots/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,7 +1,7 @@
 if INSTALL_ROBOTS
 
 botsdir = @BOTSDIR@
-nobase_bots_DATA = \
+nobase_dist_bots_DATA = \
 	misc/awstats_6.4_vhffs.patch \
 	misc/awstats_6.5_vhffs.patch \
 	misc/awstats_htaccess_example \
@@ -16,11 +16,11 @@
 	misc/mhonarc.indexmain.tmpl \
 	misc/mhonarc.indexpart.tmpl
 
-nobase_bots_SCRIPTS = \
+nobase_dist_bots_SCRIPTS = \
 	misc/svn_post-commit.pl \
 	misc/git_post-receive
 
-bots_SCRIPTS = \
+dist_bots_SCRIPTS = \
 	src/cvs_create.pl \
 	src/cvs_delete.pl \
 	src/cvs_fixperms.pl \

Modified: trunk/vhffs-tests/src/Makefile.am
===================================================================
--- trunk/vhffs-tests/src/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-tests/src/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,2 +1,2 @@
-TESTS_ENVIRONMENT = @PERL@ -I . -I ../../vhffs-api/src/
+TESTS_ENVIRONMENT = @PERL@ -I . -I @VHFFS_LIBDIR@
 TESTS = Functions.pl 

Modified: trunk/vhffs-themes/Makefile.am
===================================================================
--- trunk/vhffs-themes/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-themes/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -76,10 +76,10 @@
 if INSTALL_PANEL
 
 panelthemesdir = @PANELDIR@/themes
-nobase_panelthemes_DATA = $(themesfiles)
+nobase_dist_panelthemes_DATA = $(themesfiles)
 endif # Install panel
 
 if INSTALL_PUBLIC
 publicthemesdir = @PUBLICDIR@/themes
-nobase_publicthemes_DATA = $(themesfiles)
+nobase_dist_publicthemes_DATA = $(themesfiles)
 endif


Property changes on: trunk/vhffs-tools/mans
___________________________________________________________________
Name: svn:ignore
   + Makefile
Makefile.in


Added: trunk/vhffs-tools/mans/Makefile.am
===================================================================
--- trunk/vhffs-tools/mans/Makefile.am	                        (rev 0)
+++ trunk/vhffs-tools/mans/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -0,0 +1 @@
+EXTRA_DIST = vhffs-makeadmin.1  vhffs-quota.1  vhffs-userinfo.1  webdir.1

Modified: trunk/vhffs-tools/src/Makefile.am
===================================================================
--- trunk/vhffs-tools/src/Makefile.am	2008-01-10 15:55:56 UTC (rev 1126)
+++ trunk/vhffs-tools/src/Makefile.am	2008-01-10 22:29:44 UTC (rev 1127)
@@ -1,5 +1,5 @@
 toolsdir = @TOOLSDIR@
-tools_SCRIPTS = \
+dist_tools_SCRIPTS = \
 	vhffs-dumpmysql \
 	vhffs-groupdel \
 	vhffs-groupinfo \