Revision: 1914 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1914&view=re... Author: hyperair Date: 2011-02-09 16:42:51 +0000 (Wed, 09 Feb 2011)

Log Message: ----------- Integrate debugger into geany-plugins autofoo

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

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

Added: trunk/geany-plugins/build/debugger.m4 =================================================================== --- trunk/geany-plugins/build/debugger.m4 (rev 0) +++ trunk/geany-plugins/build/debugger.m4 2011-02-09 16:42:51 UTC (rev 1914) @@ -0,0 +1,11 @@ +AC_DEFUN([GP_CHECK_DEBUGGER], +[ + GP_ARG_DISABLE([Debugger], [auto]) + GP_CHECK_PLUGIN_DEPS([debugger], [VTE], + [vte >= 0.24]) + GP_STATUS_PLUGIN_ADD([Debugger], [$enable_debugger]) + AC_CONFIG_FILES([ + debugger/Makefile + debugger/src/Makefile + ]) +])

Modified: trunk/geany-plugins/configure.ac =================================================================== --- trunk/geany-plugins/configure.ac 2011-02-09 16:42:11 UTC (rev 1913) +++ trunk/geany-plugins/configure.ac 2011-02-09 16:42:51 UTC (rev 1914) @@ -24,6 +24,7 @@ dnl plugin checks GP_CHECK_ADDONS GP_CHECK_CODENAV +GP_CHECK_DEBUGGER GP_CHECK_GEANYCFP GP_CHECK_GEANYDOC GP_CHECK_GEANYEXTRASEL

Modified: trunk/geany-plugins/debugger/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/Makefile.am 2011-02-09 16:42:11 UTC (rev 1913) +++ trunk/geany-plugins/debugger/Makefile.am 2011-02-09 16:42:51 UTC (rev 1914) @@ -1,14 +1,11 @@ -SUBDIRS = src po +if ENABLE_CODENAV +include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +EXTRA_DIST = +endif

-EXTRA_DIST = \ - autogen.sh \ - makefile.win32 \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ - indent-all.sh +SUBDIRS = src

-DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update +EXTRA_DIST += \ + indent-all.sh

Modified: trunk/geany-plugins/debugger/src/Makefile.am =================================================================== --- trunk/geany-plugins/debugger/src/Makefile.am 2011-02-09 16:42:11 UTC (rev 1913) +++ trunk/geany-plugins/debugger/src/Makefile.am 2011-02-09 16:42:51 UTC (rev 1914) @@ -1,5 +1,11 @@ +include $(top_srcdir)/build/vars.build.mk

-lib_LTLIBRARIES = debugger.la +if ENABLE_DEBUGGER +geanyplugins_LTLIBRARIES = debugger.la +else +EXTRA_LTLIBRARIES = debugger.la +endif + debugger_la_SOURCES = \ bptree.c \ bptree.h \ @@ -32,10 +38,6 @@ watch_model.c \ watch_model.h \ wtree.c \ - wtree.h + wtree.h

-debugger_la_LDFLAGS = -module -avoid-version -debugger_la_LIBADD = @GEANY_LIBS@ $(INTLLIBS) -lutil - -AM_CFLAGS = @GEANY_CFLAGS@ -DLOCALEDIR=""$(localedir)"" -DPREFIX=""$(prefix)"" - +debugger_la_LIBADD = $(COMMONLIBS) -lutil

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