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

[hyperair at users.sourceforge.net]

Revision: 1948
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1948&view=rev
Author:   hyperair
Date:     2011-03-06 17:51:35 +0000 (Sun, 06 Mar 2011)

Log Message:
-----------
Integrate geanypg into build system

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

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

Modified: trunk/geany-plugins/Makefile.am
===================================================================
--- trunk/geany-plugins/Makefile.am	2011-03-06 17:12:50 UTC (rev 1947)
+++ trunk/geany-plugins/Makefile.am	2011-03-06 17:51:35 UTC (rev 1948)
@@ -11,6 +11,7 @@
 	geanylatex \
 	geanylipsum \
 	geanylua \
+	geanypg \
 	geanyprj \
 	geanysendmail \
 	geanyvc \

Added: trunk/geany-plugins/build/geanypg.m4
===================================================================
--- trunk/geany-plugins/build/geanypg.m4	                        (rev 0)
+++ trunk/geany-plugins/build/geanypg.m4	2011-03-06 17:51:35 UTC (rev 1948)
@@ -0,0 +1,10 @@
+AC_DEFUN([GP_CHECK_GEANYPG],
+[
+    GP_ARG_DISABLE([geanypg], [yes])
+    GP_STATUS_PLUGIN_ADD([GeanyPG], [$enable_geanypg])
+    AM_PATH_GPGME
+    AC_CONFIG_FILES([
+        geanypg/Makefile
+        geanypg/src/Makefile
+    ])
+])

Modified: trunk/geany-plugins/configure.ac
===================================================================
--- trunk/geany-plugins/configure.ac	2011-03-06 17:12:50 UTC (rev 1947)
+++ trunk/geany-plugins/configure.ac	2011-03-06 17:51:35 UTC (rev 1948)
@@ -34,6 +34,7 @@
 GP_CHECK_GEANYLATEX
 GP_CHECK_GEANYLIPSUM
 GP_CHECK_GEANYLUA
+GP_CHECK_GEANYPG
 GP_CHECK_GEANYPRJ
 GP_CHECK_GEANYSENDMAIL
 GP_CHECK_GEANYVC

Modified: trunk/geany-plugins/geanypg/Makefile.am
===================================================================
--- trunk/geany-plugins/geanypg/Makefile.am	2011-03-06 17:12:50 UTC (rev 1947)
+++ trunk/geany-plugins/geanypg/Makefile.am	2011-03-06 17:51:35 UTC (rev 1948)
@@ -1 +1,8 @@
-SUBDIRS=src
+if ENABLE_GEANYCFP
+include $(top_srcdir)/build/vars.auxfiles.mk
+else
+include $(top_srcdir)/build/vars.docs.mk
+endif
+
+SUBDIRS = src
+plugin = geanypg

Modified: trunk/geany-plugins/geanypg/src/Makefile.am
===================================================================
--- trunk/geany-plugins/geanypg/src/Makefile.am	2011-03-06 17:12:50 UTC (rev 1947)
+++ trunk/geany-plugins/geanypg/src/Makefile.am	2011-03-06 17:51:35 UTC (rev 1948)
@@ -1,5 +1,27 @@
-lib_LTLIBRARIES=geanypg.la
-geanypg_la_SOURCES=aux.c encrypt_cb.c key_selection_dialog.c sign_cb.c verify_cb.c decrypt_cb.c geanypg.c pinentry.c verify_aux.c
-geanypg_la_LDFLAGS=-module -avoid-version
-geanypg_la_LIBADD=@GEANY_LIBS@ @GPGME_LIBS@
-AM_CFLAGS=@GEANY_CFLAGS@ @GPGME_CFLAGS@
+include $(top_srcdir)/build/vars.build.mk
+
+if ENABLE_GEANYPG
+geanyplugins_LTLIBRARIES = geanypg.la
+else
+EXTRA_LTLIBRARIES = geanypg.la
+endif
+
+geanypg_la_SOURCES = \
+	aux.c \
+	encrypt_cb.c \
+	key_selection_dialog.c \
+	sign_cb.c \
+	verify_cb.c \
+	decrypt_cb.c \
+	geanypg.c \
+	geanypg.h \
+	pinentry.c \
+	verify_aux.c
+
+geanypg_la_LIBADD = \
+	$(COMMON_LIBS) \
+	$(GPGME_LIBS)
+
+geanypg_la__CFLAGS = \
+	$(AM_CFLAGS) \
+	$(GPGME_CFLAGS)


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