SF.net SVN: geany:[6013] trunk

[ntrel at users.sourceforge.net]

Revision: 6013
          http://geany.svn.sourceforge.net/geany/?rev=6013&view=rev
Author:   ntrel
Date:     2011-10-06 12:36:28 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
Fix missing tagmanager/mio/makefile.win32 in EXTRA_DIST.
Include makefile.win32 in EXTRA_DIST recursively, not at top-level.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/Makefile.am
    trunk/scintilla/Makefile.am
    trunk/src/Makefile.am
    trunk/tagmanager/Makefile.am
    trunk/tagmanager/mio/Makefile.am

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-10-06 12:21:06 UTC (rev 6012)
+++ trunk/ChangeLog	2011-10-06 12:36:28 UTC (rev 6013)
@@ -2,6 +2,10 @@
 
  * doc/Makefile.am, doc/makefile.win32:
    Add doc/makefile.win32 for docs generation.
+ * scintilla/Makefile.am, src/Makefile.am, 
+   tagmanager/mio/Makefile.am, tagmanager/Makefile.am, Makefile.am:
+   Fix missing tagmanager/mio/makefile.win32 in EXTRA_DIST.
+   Include makefile.win32 in EXTRA_DIST recursively, not at top-level.
 
 
 2011-10-06  Colomban Wendling  <colomban(at)geany(dot)org>

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2011-10-06 12:21:06 UTC (rev 6012)
+++ trunk/Makefile.am	2011-10-06 12:36:28 UTC (rev 6013)
@@ -9,10 +9,7 @@
 WIN32_BUILD_FILES = \
 	geany_private.rc \
 	win32-config.h \
-	makefile.win32 \
-	scintilla/makefile.win32 \
-	tagmanager/makefile.win32 \
-	src/makefile.win32
+	makefile.win32
 
 SYS_DATA_FILES = \
 	data/c99.tags \

Modified: trunk/scintilla/Makefile.am
===================================================================
--- trunk/scintilla/Makefile.am	2011-10-06 12:21:06 UTC (rev 6012)
+++ trunk/scintilla/Makefile.am	2011-10-06 12:36:28 UTC (rev 6013)
@@ -126,4 +126,5 @@
 	glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --header > gtk/scintilla-marshal.h
 	glib-genmarshal --prefix scintilla_marshal gtk/scintilla-marshal.list --body > gtk/scintilla-marshal.c
 
-EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt
+EXTRA_DIST=gtk/scintilla-marshal.list License.txt README version.txt \
+	makefile.win32

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2011-10-06 12:21:06 UTC (rev 6012)
+++ trunk/src/Makefile.am	2011-10-06 12:36:28 UTC (rev 6013)
@@ -3,7 +3,8 @@
 
 
 EXTRA_DIST = images.c gb.c win32.c win32.h plugindata.h \
-	documentprivate.h filetypesprivate.h pluginprivate.h projectprivate.h
+	documentprivate.h filetypesprivate.h pluginprivate.h projectprivate.h \
+	makefile.win32
 
 bin_PROGRAMS = geany
 

Modified: trunk/tagmanager/Makefile.am
===================================================================
--- trunk/tagmanager/Makefile.am	2011-10-06 12:21:06 UTC (rev 6012)
+++ trunk/tagmanager/Makefile.am	2011-10-06 12:36:28 UTC (rev 6013)
@@ -7,7 +7,8 @@
 AM_CFLAGS = -DG_LOG_DOMAIN=\""Tagmanager"\"
 
 # regex.c is the GNU regex implementation needed for Windows
-EXTRA_DIST = regex.c
+EXTRA_DIST = regex.c \
+	makefile.win32
 
 noinst_LIBRARIES = libtagmanager.a
 

Modified: trunk/tagmanager/mio/Makefile.am
===================================================================
--- trunk/tagmanager/mio/Makefile.am	2011-10-06 12:21:06 UTC (rev 6012)
+++ trunk/tagmanager/mio/Makefile.am	2011-10-06 12:36:28 UTC (rev 6013)
@@ -10,4 +10,5 @@
 EXTRA_DIST = \
 	mio.h \
 	mio-file.c \
-	mio-memory.c
+	mio-memory.c \
+	makefile.win32

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