SF.net SVN: geany-plugins:[1952] trunk/geany-plugins

[hyperair at users.sourceforge.net]

Revision: 1952
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1952&view=rev
Author:   hyperair
Date:     2011-03-06 23:55:43 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Integrate devhelp into autotools buildsys

Modified Paths:
--------------
    trunk/geany-plugins/configure.ac
    trunk/geany-plugins/devhelp/Makefile.am
    trunk/geany-plugins/devhelp/data/Makefile.am
    trunk/geany-plugins/devhelp/src/Makefile.am

Added Paths:
-----------
    trunk/geany-plugins/build/devhelp.m4

Added: trunk/geany-plugins/build/devhelp.m4
===================================================================
--- trunk/geany-plugins/build/devhelp.m4	                        (rev 0)
+++ trunk/geany-plugins/build/devhelp.m4	2011-03-06 23:55:43 UTC (rev 1952)
@@ -0,0 +1,11 @@
+AC_DEFUN([GP_CHECK_DEVHELP],
+[
+    GP_ARG_DISABLE([devhelp], [auto])
+    GP_CHECK_PLUGIN_DEPS([devhelp], [DEVHELP], [libdevhelp-1.0])
+    GP_STATUS_PLUGIN_ADD([DevHelp], [$enable_devhelp])
+    AC_CONFIG_FILES([
+        devhelp/Makefile
+        devhelp/src/Makefile
+        devhelp/data/Makefile
+    ])
+])

Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac	2011-03-06 17:53:10 UTC (rev 1951)
+++ trunk/geany-plugins/configure.ac	2011-03-06 23:55:43 UTC (rev 1952)
@@ -25,6 +25,7 @@
 GP_CHECK_ADDONS
 GP_CHECK_CODENAV
 GP_CHECK_DEBUGGER
+GP_CHECK_DEVHELP
 GP_CHECK_GEANYCFP
 GP_CHECK_GEANYDOC
 GP_CHECK_GEANYEXTRASEL

Modified: trunk/geany-plugins/devhelp/Makefile.am
===================================================================
--- trunk/geany-plugins/devhelp/Makefile.am	2011-03-06 17:53:10 UTC (rev 1951)
+++ trunk/geany-plugins/devhelp/Makefile.am	2011-03-06 23:55:43 UTC (rev 1952)
@@ -1,3 +1,8 @@
-ACLOCAL_AMFLAGS = -I m4
+if ENABLE_DEVHELP
+include $(top_srcdir)/build/vars.auxfiles.mk
+else
+include $(top_srcdir)/build/vars.docs.mk
+endif
 
 SUBDIRS = src data
+plugin = devhelp

Modified: trunk/geany-plugins/devhelp/data/Makefile.am
===================================================================
--- trunk/geany-plugins/devhelp/data/Makefile.am	2011-03-06 17:53:10 UTC (rev 1951)
+++ trunk/geany-plugins/devhelp/data/Makefile.am	2011-03-06 23:55:43 UTC (rev 1952)
@@ -1,7 +1,16 @@
-ACLOCAL_AMFLAGS = -I m4
+include $(top_srcdir)/build/vars.docs.mk
 
-dist_pkgdata_DATA =	devhelp-plugin.svg \
-					devhelp-plugin-48.png \
-					geany-devhelp-plugin.png \
-					home.html \
-					devhelp.conf
+FILES = \
+	devhelp-plugin.svg \
+	devhelp-plugin-48.png \
+	geany-devhelp-plugin.png \
+	home.html \
+	devhelp.conf
+
+EXTRA_DIST = $(FILES)
+
+if ENABLE_DEVHELP
+plugindata_DATA = $(FILES)
+else
+EXTRA_DATA = $(FILES)
+endif

Modified: trunk/geany-plugins/devhelp/src/Makefile.am
===================================================================
--- trunk/geany-plugins/devhelp/src/Makefile.am	2011-03-06 17:53:10 UTC (rev 1951)
+++ trunk/geany-plugins/devhelp/src/Makefile.am	2011-03-06 23:55:43 UTC (rev 1952)
@@ -1,12 +1,20 @@
-ACLOCAL_AMFLAGS = -I m4
+include $(top_srcdir)/build/vars.build.mk
+include $(top_srcdir)/build/vars.docs.mk
 
-geanypluginsdir 					= $(libdir)/geany
-geanyplugins_LTLIBRARIES	= devhelp.la
+plugin = devhelp
 
-devhelp_la_LDFLAGS 				= -module -avoid-version -shared
-devhelp_la_CPPFLAGS 			= @GTK_CFLAGS@			\
-														@GEANY_CFLAGS@		\
-														@DEVHELP_CFLAGS@	\
-														-DDHPLUG_DATA_DIR=\"$(pkgdatadir)\"
-devhelp_la_LIBADD 				= @GTK_LIBS@ @GEANY_LIBS@ @DEVHELP_LIBS@
-devhelp_la_SOURCES				= plugin.c dh-plugin.c main-notebook.c
+if ENABLE_DEVHELP
+geanyplugins_LTLIBRARIES = devhelp.la
+else
+EXTRA_LTLIBRARIES = devhelp.la
+endif
+
+devhelp_la_SOURCES = \
+	plugin.c \
+	dh-plugin.c \
+	main-notebook.c
+devhelp_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DEVHELP_CFLAGS) \
+	-DDHPLUG_DATA_DIR=\"$(plugindata)\"
+devhelp_la_LIBADD = $(DEVHELP_LIBS)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.