[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-342-g2f5b7e9)
The branch, master has been updated
via 2f5b7e9d890953680caa4fa111c31a0be4123d97 (commit)
from 939998b8b4f6742814910a043778962f4654d5a9 (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/configure.ac | 4 +++-
gschem/configure.ac.in | 4 +++-
libgeda/configure.ac.in | 2 +-
utils/configure.ac | 13 ++++---------
utils/src/Makefile.am | 3 ---
5 files changed, 11 insertions(+), 15 deletions(-)
=================
Commit Messages
=================
commit 2f5b7e9d890953680caa4fa111c31a0be4123d97
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon Dec 8 17:16:20 2008 +0000
Adjust MINGW32 specific CFLAGS from the suite
Console applications should not build with the -mwindows flag, otherwise
output reach the console. Conversely, we should build the GUI apps, gschem
and gattrib with -mwindows so they don't bring up a console window when
running.
:100644 100644 e0a861b... 4a1848b... M gattrib/configure.ac
:100644 100644 258e7b2... 4e36ffd... M gschem/configure.ac.in
:100644 100644 c59039a... 7920c8f... M libgeda/configure.ac.in
:100644 100644 c7c9e57... 8cfa616... M utils/configure.ac
:100644 100644 5bbb546... f35ee46... M utils/src/Makefile.am
=========
Changes
=========
commit 2f5b7e9d890953680caa4fa111c31a0be4123d97
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Mon Dec 8 17:16:20 2008 +0000
Adjust MINGW32 specific CFLAGS from the suite
Console applications should not build with the -mwindows flag, otherwise
output reach the console. Conversely, we should build the GUI apps, gschem
and gattrib with -mwindows so they don't bring up a console window when
running.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index e0a861b..4a1848b 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -86,9 +86,11 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
+ MINGW_CFLAGS="-mms-bitfields -mwindows"
else
# Unix host
MINGW="no"
+ MINGW_CFLAGS=
fi
#
@@ -433,7 +435,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
#########################################################################
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GATTRIB_CFLAGS="$GTK_CFLAGS $GLIB_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS"
+GATTRIB_CFLAGS="$MINGW_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $LIBGEDA_CFLAGS $GTHREAD_CFLAGS"
GATTRIB_LDFLAGS="$GTK_LIBS $GLIB_LIBS $LIBGEDA_LIBS $GTHREAD_LIBS"
# Makefile.in variable substitution
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 258e7b2..4e36ffd 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -50,9 +50,11 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
+ MINGW_CFLAGS="-mms-bitfields -mwindows"
else
# Unix host
MINGW="no"
+ MINGW_CFLAGS=
fi
#
@@ -600,7 +602,7 @@ AM_GNU_GETTEXT_VERSION([%INSTALLED_GETTEXT_VERSION%])
#AM_GLIB_GNU_GETTEXT
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
-GSCHEM_CFLAGS="$LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS"
+GSCHEM_CFLAGS="$MINGW_CFLAGS $LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS $GTK_CFLAGS $GTHREAD_CFLAGS"
GSCHEM_LDFLAGS="$LIBSTROKE_LIBS $LIBGEDA_LIBS $GTK_LIBS $X_LDFLAGS $DMALLOC_LIBS $GTHREAD_LIBS"
# Makefile.in variable substitution
diff --git a/libgeda/configure.ac.in b/libgeda/configure.ac.in
index c59039a..7920c8f 100644
--- a/libgeda/configure.ac.in
+++ b/libgeda/configure.ac.in
@@ -48,7 +48,7 @@ case $host_os in
esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
- MINGW_CFLAGS="-mms-bitfields -mwindows"
+ MINGW_CFLAGS="-mms-bitfields"
MINGW="yes"
else
# Unix host
diff --git a/utils/configure.ac b/utils/configure.ac
index c7c9e57..8cfa616 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -74,11 +74,9 @@ case $host_os in
esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
- MINGW_CFLAGS="-mms-bitfields -mwindows"
MINGW="yes"
else
# Unix host
- MINGW_CFLAGS=
MINGW="no"
fi
@@ -451,12 +449,12 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
GSCHLAS_CFLAGS="$LIBGEDA_CFLAGS"
GSCHLAS_LDFLAGS="$LIBGEDA_LIBS $GTK_LIBS"
-GMK_SYM_CFLASG="$MINGW_CFLAGS"
-SMASH_MEGAFILE_CFLAGS="$MINGW_CFLAGS"
CONVERT_SYM_CFLAGS="$LIBGEDA_CFLAGS"
SARLACC_SCHEM_CFLAGS="$LIBGEDA_CFLAGS"
-OLIB_CFLAGS="$MINGW_CFLAGS"
-GSCH2PCB_CFLAGS="$GLIB_CFLAGS $MINGW_CFLAGS"
+GMK_SYM_CFLASG=""
+SMASH_MEGAFILE_CFLAGS=""
+OLIB_CFLAGS=""
+GSCH2PCB_CFLAGS="$GLIB_CFLAGS"
GSCH2PCB_LDFLAGS="$GLIB_LIBS"
GRENUM_CFLAGS="$LIBGEDA_CFLAGS"
GRENUM_LDFLAGS="$GLIB_LIBS"
@@ -466,11 +464,8 @@ AC_SUBST(DATE_VERSION)
AC_SUBST(DOTTED_VERSION)
AC_SUBST(GSCHLAS_CFLAGS)
AC_SUBST(GSCHLAS_LDFLAGS)
-AC_SUBST(GMK_SYM_CFLAGS)
-AC_SUBST(SMASH_MEGAFILE_CFLAGS)
AC_SUBST(CONVERT_SYM_CFLAGS)
AC_SUBST(SARLACC_SCHEM_CFLAGS)
-AC_SUBST(OLIB_CFLAGS)
AC_SUBST(GSCH2PCB_CFLAGS)
AC_SUBST(GSCH2PCB_LDFLAGS)
AC_SUBST(GRENUM_CFLAGS)
diff --git a/utils/src/Makefile.am b/utils/src/Makefile.am
index 5bbb546..f35ee46 100644
--- a/utils/src/Makefile.am
+++ b/utils/src/Makefile.am
@@ -16,11 +16,8 @@ olib_SOURCES = olib.l geda_sym_format.h
gsch2pcb_SOURCES = gsch2pcb.c
grenum_SOURCES = grenum.c grenum.h
-gmk_sym_CFLAGS = @GMK_SYM_CFLAGS@ $(AM_CFLAGS)
-smash_megafile_CFLAGS = @SMASH_MEGAFILE_CFLAGS@ $(AM_CFLAGS)
convert_sym_CFLAGS = @CONVERT_SYM_CFLAGS@ $(AM_CFLAGS)
sarlacc_schem_CFLAGS = @SARLACC_SCHEM_CFLAGS@ $(AM_CFLAGS)
-olib_CFLAGS = @OLIB_CFLAGS@ $(AM_CFLAGS)
gsch2pcb_CFLAGS = @GSCH2PCB_CFLAGS@ $(AM_CFLAGS)
grenum_CFLAGS = @GRENUM_CFLAGS@ $(AM_CFLAGS)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs