SF.net SVN: geany:[3308] trunk
ntrel at users.sourceforge.net
ntrel at xxxxx
Wed Dec 3 12:41:05 UTC 2008
Revision: 3308
http://geany.svn.sourceforge.net/geany/?rev=3308&view=rev
Author: ntrel
Date: 2008-12-03 12:41:05 +0000 (Wed, 03 Dec 2008)
Log Message:
-----------
Move target for geanyfunctions.h to plugins/Makefile.am and depend
on src/plugins.c instead of all plugin API headers.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/Makefile.am
trunk/src/Makefile.am
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-12-02 18:33:41 UTC (rev 3307)
+++ trunk/ChangeLog 2008-12-03 12:41:05 UTC (rev 3308)
@@ -1,3 +1,10 @@
+2008-12-03 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * plugins/Makefile.am, src/Makefile.am:
+ Move target for geanyfunctions.h to plugins/Makefile.am and depend
+ on src/plugins.c instead of all plugin API headers.
+
+
2008-12-02 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
* src/Makefile.am, plugins/geanyfunctions.h, plugins/Makefile.am,
Modified: trunk/plugins/Makefile.am
===================================================================
--- trunk/plugins/Makefile.am 2008-12-02 18:33:41 UTC (rev 3307)
+++ trunk/plugins/Makefile.am 2008-12-03 12:41:05 UTC (rev 3308)
@@ -13,6 +13,13 @@
pluginmacros.h \
geanyfunctions.h
+# systems without python should continue to build OK
+geanyfunctions.h: genapi.py ../src/plugins.c
+ python genapi.py || true
+
+all: geanyfunctions.h
+
+
demoplugin_la_LDFLAGS = -module -avoid-version
classbuilder_la_LDFLAGS = -module -avoid-version
htmlchars_la_LDFLAGS = -module -avoid-version
Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am 2008-12-02 18:33:41 UTC (rev 3307)
+++ trunk/src/Makefile.am 2008-12-03 12:41:05 UTC (rev 3308)
@@ -74,13 +74,6 @@
nodist_EXTRA_geany_SOURCES = dummy.cxx
-# generate geanyfunctions.h here so we can read geany_include_HEADERS
-../plugins/geanyfunctions.h: $(geany_include_HEADERS) ../plugins/genapi.py
- cd ../plugins && python genapi.py || echo -n
-
-all: ../plugins/geanyfunctions.h
-
-
if MINGW
# build Geany for Windows on non-Windows systems (cross-compile)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Commits
mailing list