gEDA-cvs: gaf.git: branch: stable-1.6 updated (1.6.1-20100214-1-g4491d03)

[git@xxxxxxxxxx]

The branch, stable-1.6 has been updated
       via  4491d031d5f02a43ec72443a3be6668c9cdc58b6 (commit)
      from  11921dc18209ed4ea12288114634bb94a5b9b8a9 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


=========
 Summary
=========

 gattrib/src/Makefile.am |    4 ++--
 gschem/src/Makefile.am  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)


=================
 Commit Messages
=================

commit 4491d031d5f02a43ec72443a3be6668c9cdc58b6
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix hiding the command prompt window on Win32 builds with -mwindows
    
    There was a mistake in gschem and gattrib's Makefile.am, where it
    included the non-existant MINGW_GUI_CFLAGS rather than pulling in
    MINGW_GUI_LDFLAGS where the required -mwindows was set.
    
    Cherry-picked from: e5f32954a1fb23534309d6fa06d887859afbc664
    and subsequent fix: 66e54fd03f75f70d9fcf101d6ed3cad1bb354b13

:100644 100644 623b639... 275571c... M	gattrib/src/Makefile.am
:100644 100644 2cd0d90... d3d6681... M	gschem/src/Makefile.am

=========
 Changes
=========

commit 4491d031d5f02a43ec72443a3be6668c9cdc58b6
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Commit: Peter Clifton <pcjc2@xxxxxxxxx>

    Fix hiding the command prompt window on Win32 builds with -mwindows
    
    There was a mistake in gschem and gattrib's Makefile.am, where it
    included the non-existant MINGW_GUI_CFLAGS rather than pulling in
    MINGW_GUI_LDFLAGS where the required -mwindows was set.
    
    Cherry-picked from: e5f32954a1fb23534309d6fa06d887859afbc664
    and subsequent fix: 66e54fd03f75f70d9fcf101d6ed3cad1bb354b13

diff --git a/gattrib/src/Makefile.am b/gattrib/src/Makefile.am
index 623b639..275571c 100644
--- a/gattrib/src/Makefile.am
+++ b/gattrib/src/Makefile.am
@@ -34,10 +34,10 @@ gattrib_SOURCES = \
 gattrib_CPPFLAGS = -I$(top_srcdir)/libgeda/include \
 	-I$(srcdir)/../include -I$(top_srcdir) -I$(includedir)
 gattrib_CFLAGS = $(GCC_CFLAGS) $(GLIB_CFLAGS) \
-	$(MINGW_CFLAGS) $(MINGW_GUI_CFLAGS) \
+	$(MINGW_CFLAGS) \
 	$(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
 gattrib_LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) \
-	$(GUILE_LIBS)
+	$(GUILE_LIBS) $(MINGW_GUI_LDFLAGS)
 gattrib_LDADD = $(top_builddir)/libgeda/src/libgeda.la
 
 MOSTLYCLEANFILES = *.log *.ps core FILE *~ #*# 
diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am
index 2cd0d90..d3d6681 100644
--- a/gschem/src/Makefile.am
+++ b/gschem/src/Makefile.am
@@ -70,10 +70,10 @@ gschem_SOURCES = \
 gschem_CPPFLAGS = -I$(top_srcdir)/libgeda/include  -I$(srcdir)/../include \
 	-I$(top_srcdir) -I$(includedir) -I$(top_srcdir)/intl
 gschem_CFLAGS = $(GCC_CFLAGS) $(LIBSTROKE_CFLAGS) \
-	$(MINGW_CFLAGS) $(MINGW_GUI_CFLAGS) \
+	$(MINGW_CFLAGS) \
 	$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
 gschem_LDFLAGS = $(LIBSTROKE_LDFLAGS) $(GLIB_LIBS) $(GTK_LIBS) \
-	$(GTHREAD_LIBS) $(GUILE_LIBS)
+	$(GTHREAD_LIBS) $(GUILE_LIBS) $(MINGW_GUI_LDFLAGS)
 gschem_LDADD = $(top_builddir)/libgeda/src/libgeda.la @LIBINTL@
 
 localedir = @datadir@/locale




_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs