Revision: 1718 http://geany-plugins.svn.sourceforge.net/geany-plugins/?rev=1718&view=re... Author: hyperair Date: 2010-11-05 18:39:46 +0000 (Fri, 05 Nov 2010)

Log Message: ----------- Integrate GeanyVC with its AM_CONDITIONALs

Modified Paths: -------------- trunk/geany-plugins/geanyvc/Makefile.am trunk/geany-plugins/geanyvc/src/Makefile.am trunk/geany-plugins/geanyvc/tests/Makefile.am

Modified: trunk/geany-plugins/geanyvc/Makefile.am =================================================================== --- trunk/geany-plugins/geanyvc/Makefile.am 2010-11-05 18:39:12 UTC (rev 1717) +++ trunk/geany-plugins/geanyvc/Makefile.am 2010-11-05 18:39:46 UTC (rev 1718) @@ -1,4 +1,8 @@ +if ENABLE_GEANYVC include $(top_srcdir)/build/vars.auxfiles.mk +else +include $(top_srcdir)/build/vars.docs.mk +endif

SUBDIRS = src tests plugin = geanyvc

Modified: trunk/geany-plugins/geanyvc/src/Makefile.am =================================================================== --- trunk/geany-plugins/geanyvc/src/Makefile.am 2010-11-05 18:39:12 UTC (rev 1717) +++ trunk/geany-plugins/geanyvc/src/Makefile.am 2010-11-05 18:39:46 UTC (rev 1718) @@ -1,6 +1,11 @@ include $(top_srcdir)/build/vars.build.mk

+if ENABLE_GEANYVC geanyplugins_LTLIBRARIES = geanyvc.la +else +EXTRA_LTLIBRARIES = geanyvc.la +endif + geanyvc_la_SOURCES = \ externdiff.c \ geanyvc.c \

Modified: trunk/geany-plugins/geanyvc/tests/Makefile.am =================================================================== --- trunk/geany-plugins/geanyvc/tests/Makefile.am 2010-11-05 18:39:12 UTC (rev 1717) +++ trunk/geany-plugins/geanyvc/tests/Makefile.am 2010-11-05 18:39:46 UTC (rev 1718) @@ -1,4 +1,5 @@ if UNITTESTS +if ENABLE_GEANYVC include $(top_srcdir)/build/vars.build.mk INCLUDES = $(GEANY_CFLAGS) -DUNITTESTS TESTS=unittests @@ -6,3 +7,4 @@ unittests_SOURCES = unittests.c ../src/utils.c unittests_LDADD = @GEANY_LIBS@ $(INTLLIBS) @CHECK_LIBS@ endif +endif

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