[vhffs-dev] [2092] removed VHFFS_LIBDIR from Makefile, moved exmaples, merged vhffs-api /src/Vhffs/Makefile.am to vhffs-api/src/Makefile.am

[subversion@xxxxxxxxxxxxx]

Revision: 2092
Author:   gradator
Date:     2012-03-02 21:41:46 +0100 (Fri, 02 Mar 2012)
Log Message:
-----------
removed VHFFS_LIBDIR from Makefile, moved exmaples, merged vhffs-api/src/Vhffs/Makefile.am to vhffs-api/src/Makefile.am

Modified Paths:
--------------
    trunk/configure.ac
    trunk/vhffs-api/Makefile.am
    trunk/vhffs-api/src/Makefile.am
    trunk/vhffs-compat/Makefile.am
    trunk/vhffs-cron/src/Makefile.am
    trunk/vhffs-irc/Makefile.am
    trunk/vhffs-jabber/Makefile.am
    trunk/vhffs-listengine/src/Makefile.am
    trunk/vhffs-panel/Makefile.am
    trunk/vhffs-public/Makefile.am
    trunk/vhffs-robots/Makefile.am
    trunk/vhffs-tools/src/Makefile.am

Added Paths:
-----------
    trunk/vhffs-api/examples/

Removed Paths:
-------------
    trunk/vhffs-api/src/Vhffs/Makefile.am
    trunk/vhffs-api/src/examples/

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/configure.ac	2012-03-02 20:41:46 UTC (rev 2092)
@@ -73,12 +73,10 @@
 AC_ARG_WITH(api-path,
     AC_HELP_STRING([--with-api-path=path],
         [Path for perl modules (API) (/usr/share/vhffs/api)]),
-    VHFFS_LIBDIR=$withval,
-    VHFFS_LIBDIR=${prefix}/share/vhffs/api
+    APIDIR=$withval,
+    APIDIR=${prefix}/share/vhffs/api
 )
-APIDIR=$VHFFS_LIBDIR/Vhffs
 AC_SUBST(APIDIR)
-AC_SUBST(VHFFS_LIBDIR)
 
 dnl panel path
 AC_ARG_WITH(panel-path,
@@ -369,7 +367,6 @@
 	Makefile
 	vhffs-api/Makefile
 	vhffs-api/src/Makefile
-	vhffs-api/src/Vhffs/Makefile
 	vhffs-autokill/Makefile
 	vhffs-backend/Makefile
 	vhffs-backend/src/Makefile

Modified: trunk/vhffs-api/Makefile.am
===================================================================
--- trunk/vhffs-api/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-api/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -1,3 +1,3 @@
 SUBDIRS = src
-EXTRA_DIST = debian
+EXTRA_DIST = debian example
 

Modified: trunk/vhffs-api/src/Makefile.am
===================================================================
--- trunk/vhffs-api/src/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-api/src/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -1,3 +1,106 @@
-SUBDIRS = Vhffs
-EXTRA_DIST = examples
+apidir = @APIDIR@
 
+revision=`svnversion . | perl -e '$$_ = <STDIN>; /^(?:.*?:)?(\d+)\w*\$$/; print \$$1;'`
+botsdir = @BOTSDIR@
+
+files_do_sed = \
+	Vhffs/Acl.pm \
+	Vhffs/Conf.pm \
+	Vhffs/Constants.pm \
+	Vhffs/Functions.pm \
+	Vhffs/Group.pm \
+	Vhffs/Listengine.pm \
+	Vhffs/Broadcast.pm \
+	Vhffs/Main.pm \
+	Vhffs/ObjectFactory.pm \
+	Vhffs/Object.pm \
+	Vhffs/Robots.pm \
+	Vhffs/Services.pm \
+	Vhffs/Stats.pm \
+	Vhffs/Tag.pm \
+	Vhffs/User.pm \
+	Vhffs/UserGroup.pm \
+	Vhffs/Panel/Acl.pm \
+	Vhffs/Panel/Admin.pm \
+	Vhffs/Panel/Auth.pm \
+	Vhffs/Panel/Avatar.pm \
+	Vhffs/Panel/Bazaar.pm \
+	Vhffs/Panel/Commons.pm \
+	Vhffs/Panel/Contact.pm \
+	Vhffs/Panel/Cvs.pm \
+	Vhffs/Panel/DNS.pm \
+	Vhffs/Panel/Group.pm \
+	Vhffs/Panel/Home.pm \
+	Vhffs/Panel/Mail.pm \
+	Vhffs/Panel/MailingList.pm \
+	Vhffs/Panel/Broadcast.pm \
+	Vhffs/Panel/Main.pm \
+	Vhffs/Panel/Mercurial.pm \
+	Vhffs/Panel/Moderation.pm \
+	Vhffs/Panel/Mysql.pm \
+	Vhffs/Panel/Object.pm \
+	Vhffs/Panel/Pgsql.pm \
+	Vhffs/Panel/Public.pm \
+	Vhffs/Panel/Repository.pm \
+	Vhffs/Panel/Subscribe.pm \
+	Vhffs/Panel/Svn.pm \
+	Vhffs/Panel/Stats.pm \
+	Vhffs/Panel/Tag.pm \
+	Vhffs/Panel/Git.pm \
+	Vhffs/Panel/User.pm \
+	Vhffs/Panel/Web.pm \
+	Vhffs/Panel/Cron.pm \
+	Vhffs/Robots/Bazaar.pm \
+	Vhffs/Robots/Broadcast.pm \
+	Vhffs/Robots/Cvs.pm \
+	Vhffs/Robots/DNS.pm \
+	Vhffs/Robots/Group.pm \
+	Vhffs/Robots/Mail.pm \
+	Vhffs/Robots/MailingList.pm \
+	Vhffs/Robots/Mercurial.pm \
+	Vhffs/Robots/Mysql.pm \
+	Vhffs/Robots/Pgsql.pm \
+	Vhffs/Robots/Repository.pm \
+	Vhffs/Robots/Svn.pm \
+	Vhffs/Robots/Git.pm \
+	Vhffs/Robots/User.pm \
+	Vhffs/Robots/UserGroup.pm \
+	Vhffs/Robots/Web.pm \
+	Vhffs/Robots/Cron.pm \
+	Vhffs/Services/Bazaar.pm \
+	Vhffs/Services/Cvs.pm \
+	Vhffs/Services/DNS.pm \
+	Vhffs/Services/Web.pm \
+	Vhffs/Services/Mail.pm \
+	Vhffs/Services/MailingList.pm \
+	Vhffs/Services/Newsletter.pm \
+	Vhffs/Services/MailUser.pm \
+	Vhffs/Services/MailGroup.pm \
+	Vhffs/Services/Mercurial.pm \
+	Vhffs/Services/Mysql.pm \
+	Vhffs/Services/Pgsql.pm \
+	Vhffs/Services/Repository.pm \
+	Vhffs/Services/Svn.pm \
+	Vhffs/Services/Git.pm \
+	Vhffs/Services/Cron.pm \
+	Vhffs/Tag/Category.pm \
+	Vhffs/Tag/Request.pm
+
+files_no_sed = 
+
+nobase_dist_api_DATA = \
+	$(files_do_sed) \
+	$(files_no_sed)
+
+# Define the substitution we need to point perl script at correct location
+do_sed = $(SED) --in-place \
+	-e 's,%PERL%,$(PERL),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g' \
+	-e 's,'%VHFFS_REVISION%",$(revision),g" \
+	-e 's,'%VHFFS_BOTS_DIR%',$(botsdir),g' \
+	-e 's,'%localedir%',$(localedir),g'
+
+install-data-hook:
+	for f in $(files_do_sed) ; do \
+		$(do_sed) $(DESTDIR)$(apidir)/$$f; \
+	done

Deleted: trunk/vhffs-api/src/Vhffs/Makefile.am
===================================================================
--- trunk/vhffs-api/src/Vhffs/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-api/src/Vhffs/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -1,108 +0,0 @@
-apidir = @APIDIR@
-
-revision=`svnversion . | perl -e '$$_ = <STDIN>; /^(?:.*?:)?(\d+)\w*\$$/; print \$$1;'`
-botsdir = @BOTSDIR@
-
-files_do_sed = \
-	Acl.pm \
-	Conf.pm \
-	Constants.pm \
-	Functions.pm \
-	Group.pm \
-	Listengine.pm \
-	Broadcast.pm \
-	Main.pm \
-	ObjectFactory.pm \
-	Object.pm \
-	Robots.pm \
-	Services.pm \
-	Stats.pm \
-	Tag.pm \
-	User.pm \
-	UserGroup.pm \
-	Panel/Acl.pm \
-	Panel/Admin.pm \
-	Panel/Auth.pm \
-	Panel/Avatar.pm \
-	Panel/Bazaar.pm \
-	Panel/Commons.pm \
-	Panel/Contact.pm \
-	Panel/Cvs.pm \
-	Panel/DNS.pm \
-	Panel/Group.pm \
-	Panel/Home.pm \
-	Panel/Mail.pm \
-	Panel/MailingList.pm \
-	Panel/Broadcast.pm \
-	Panel/Main.pm \
-	Panel/Mercurial.pm \
-	Panel/Moderation.pm \
-	Panel/Mysql.pm \
-	Panel/Object.pm \
-	Panel/Pgsql.pm \
-	Panel/Public.pm \
-	Panel/Repository.pm \
-	Panel/Subscribe.pm \
-	Panel/Svn.pm \
-	Panel/Stats.pm \
-	Panel/Tag.pm \
-	Panel/Git.pm \
-	Panel/User.pm \
-	Panel/Web.pm \
-	Panel/Cron.pm \
-	Robots/Bazaar.pm \
-	Robots/Broadcast.pm \
-	Robots/Cvs.pm \
-	Robots/DNS.pm \
-	Robots/Group.pm \
-	Robots/Mail.pm \
-	Robots/MailingList.pm \
-	Robots/Mercurial.pm \
-	Robots/Mysql.pm \
-	Robots/Pgsql.pm \
-	Robots/Repository.pm \
-	Robots/Svn.pm \
-	Robots/Git.pm \
-	Robots/User.pm \
-	Robots/UserGroup.pm \
-	Robots/Web.pm \
-	Robots/Cron.pm \
-	Services/Bazaar.pm \
-	Services/Cvs.pm \
-	Services/DNS.pm \
-	Services/Web.pm \
-	Services/Mail.pm \
-	Services/MailingList.pm \
-	Services/Newsletter.pm \
-	Services/MailUser.pm \
-	Services/MailGroup.pm \
-	Services/Mercurial.pm \
-	Services/Mysql.pm \
-	Services/Pgsql.pm \
-	Services/Repository.pm \
-	Services/Svn.pm \
-	Services/Git.pm \
-	Services/Cron.pm \
-	Tag/Category.pm \
-	Tag/Request.pm
-
-files_no_sed = 
-
-nobase_dist_api_DATA = \
-	$(files_do_sed) \
-	$(files_no_sed)
-
-# Define the substitution we need to point perl script at correct location
-do_sed = $(SED) --in-place \
-	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g' \
-	-e 's,'%VHFFS_REVISION%",$(revision),g" \
-	-e 's,'%VHFFS_BOTS_DIR%',$(botsdir),g' \
-	-e 's,'%localedir%',$(localedir),g'
-
-
-install-data-hook:
-	for f in $(files_do_sed) ; do \
-		$(do_sed) $(DESTDIR)$(apidir)/$$f; \
-	done
-

Modified: trunk/vhffs-compat/Makefile.am
===================================================================
--- trunk/vhffs-compat/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-compat/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -11,7 +11,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g' \
 	-e 's,'%VHFFS_BACKEND_DIR%',$(BACKENDDIR),g' \
 	-e 's,'%VHFFS_COMPAT_DIR%',$(compatdir),g' \
 	-e 's,'%VHFFS_BOTS_DIR%',$(BOTSDIR),g' \

Modified: trunk/vhffs-cron/src/Makefile.am
===================================================================
--- trunk/vhffs-cron/src/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-cron/src/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -5,7 +5,7 @@
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
 	-e 's,%localedir%,$(localedir),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-irc/Makefile.am
===================================================================
--- trunk/vhffs-irc/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-irc/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -6,7 +6,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
         -e 's,%PERL%,$(PERL),g' \
-        -e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+        -e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-jabber/Makefile.am
===================================================================
--- trunk/vhffs-jabber/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-jabber/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -6,7 +6,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-listengine/src/Makefile.am
===================================================================
--- trunk/vhffs-listengine/src/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-listengine/src/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -5,7 +5,7 @@
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
 	-e 's,%localedir%,$(localedir),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-panel/Makefile.am
===================================================================
--- trunk/vhffs-panel/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-panel/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -800,7 +800,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-public/Makefile.am
===================================================================
--- trunk/vhffs-public/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-public/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -7,7 +7,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook

Modified: trunk/vhffs-robots/Makefile.am
===================================================================
--- trunk/vhffs-robots/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-robots/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -52,7 +52,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g' \
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g' \
 	-e 's,'%VHFFS_BOTS_DIR%',$(botsdir),g'
 
 # Because automake, exec-hook is executed before install-scripts

Modified: trunk/vhffs-tools/src/Makefile.am
===================================================================
--- trunk/vhffs-tools/src/Makefile.am	2012-03-02 20:12:43 UTC (rev 2091)
+++ trunk/vhffs-tools/src/Makefile.am	2012-03-02 20:41:46 UTC (rev 2092)
@@ -21,7 +21,7 @@
 # Define the substitution we need to point perl script at correct location
 do_sed = $(SED) --in-place \
 	-e 's,%PERL%,$(PERL),g' \
-	-e 's,'%VHFFS_LIB_DIR%',$(VHFFS_LIBDIR),g'
+	-e 's,'%VHFFS_LIB_DIR%',$(APIDIR),g'
 
 # Because automake, exec-hook is executed before install-scripts
 # so install-data is after. Here we use a data-hook