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

[colombanw at users.sourceforge.net]

Revision: 2009
          http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=2009&view=rev
Author:   colombanw
Date:     2011-03-30 22:03:34 +0000 (Wed, 30 Mar 2011)

Log Message:
-----------
Fix `make distcheck` and VPATH builds

Patch against geanyprj/tests/Makefile.am is from Nathan Phillip Brink,
thanks.

Modified Paths:
--------------
    trunk/geany-plugins/build/cppcheck.mk
    trunk/geany-plugins/devhelp/src/Makefile.am
    trunk/geany-plugins/geanyprj/tests/Makefile.am

Added Paths:
-----------
    trunk/geany-plugins/tableconvert/wscript_configure

Modified: trunk/geany-plugins/build/cppcheck.mk
===================================================================
--- trunk/geany-plugins/build/cppcheck.mk	2011-03-28 08:22:04 UTC (rev 2008)
+++ trunk/geany-plugins/build/cppcheck.mk	2011-03-30 22:03:34 UTC (rev 2009)
@@ -1,7 +1,7 @@
 
 if HAVE_CPPCHECK
 
-check-cppcheck: .
+check-cppcheck: $(srcdir)
 	$(CPPCHECK) -q --template gcc --error-exitcode=2 $^
 
 check-local: check-cppcheck

Modified: trunk/geany-plugins/devhelp/src/Makefile.am
===================================================================
--- trunk/geany-plugins/devhelp/src/Makefile.am	2011-03-28 08:22:04 UTC (rev 2008)
+++ trunk/geany-plugins/devhelp/src/Makefile.am	2011-03-30 22:03:34 UTC (rev 2009)
@@ -13,10 +13,17 @@
 	plugin.c \
 	devhelpplugin.c \
 	main-notebook.c
+
+noinst_HEADERS = \
+	plugin.h \
+	devhelpplugin.h \
+	main-notebook.h
+
 devhelp_la_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DEVHELP_CFLAGS) \
 	-DDHPLUG_DATA_DIR=\"$(plugindatadir)\"
+
 devhelp_la_LIBADD = $(DEVHELP_LIBS)
 
 include $(top_srcdir)/build/cppcheck.mk

Modified: trunk/geany-plugins/geanyprj/tests/Makefile.am
===================================================================
--- trunk/geany-plugins/geanyprj/tests/Makefile.am	2011-03-28 08:22:04 UTC (rev 2008)
+++ trunk/geany-plugins/geanyprj/tests/Makefile.am	2011-03-30 22:03:34 UTC (rev 2009)
@@ -1,6 +1,6 @@
 if UNITTESTS
 include $(top_srcdir)/build/vars.build.mk
-INCLUDES = $(GEANY_CFLAGS) -I../src -DUNITTESTS
+INCLUDES = $(GEANY_CFLAGS) -I$(srcdir)/../src -DUNITTESTS
 TESTS=unittests
 noinst_PROGRAMS=unittests
 unittests_SOURCES = unittests.c ../src/utils.c

Added: trunk/geany-plugins/tableconvert/wscript_configure
===================================================================

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