[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.4-20090830-11-ga1bff61)
The branch, master has been updated
via a1bff619eb7f1c7be77cca7c47b82dc80b4e3571 (commit)
via 1d83fae5a612f52affc5252fa3ef3324d01657a1 (commit)
via 5ca5b9768cf70f3d0f905d784d0896c6b442c34f (commit)
from 488a4849946cfb6e57469302cc24d4d98557aa46 (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
=========
configure.ac | 5 +--
gattrib/src/Makefile.am | 3 +-
gschem/src/Makefile.am | 3 +-
libgeda/src/Makefile.am | 2 +-
m4/geda-windows.m4 | 71 +++++++++++++++++++++++++++++++++++++
symbols/documentation/Makefile.am | 18 +++++-----
6 files changed, 87 insertions(+), 15 deletions(-)
create mode 100644 m4/geda-windows.m4
=================
Commit Messages
=================
commit 1d83fae5a612f52affc5252fa3ef3324d01657a1
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Commit: Cesar Strauss <cestrauss@xxxxxxxxx>
build-sys: Avoid using "$*" for source files.
When building out-of-tree, commands using $* for source files will not
find them, since $* refers to the target, not the source. Better use
$< for source files and $@ for target files.
:100644 100644 a9d68e2... 68a45f8... M symbols/documentation/Makefile.am
commit 5ca5b9768cf70f3d0f905d784d0896c6b442c34f
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Commit: Cesar Strauss <cestrauss@xxxxxxxxx>
build-sys: Check and set Windows-specific flags.
The Windows platform has a native gcc port (MinGW) and a
POSIX compliant one (Cygwin). Both need specific flags to
build correctly.
The rules are:
* On all Windows platforms, pass -no-undefined to libtool.
This allows shared libraries (DLLs) to be built.
* On MinGW, use the -mms-bitfields compiler flag.
This increases compatibility with the MSVC compiler.
* On MinGW, pass -mwindows when linking GUI-only applications.
This avoids opening a text console when running from a shortcut.
:100644 100644 fc4a775... 7a2cb31... M configure.ac
:100644 100644 d5c368d... fed3881... M gattrib/src/Makefile.am
:100644 100644 71a43e4... 2cd0d90... M gschem/src/Makefile.am
:100644 100644 6b05031... 3a20a1c... M libgeda/src/Makefile.am
:000000 100644 0000000... 1e9b45f... A m4/geda-windows.m4
=========
Changes
=========
commit 1d83fae5a612f52affc5252fa3ef3324d01657a1
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Commit: Cesar Strauss <cestrauss@xxxxxxxxx>
build-sys: Avoid using "$*" for source files.
When building out-of-tree, commands using $* for source files will not
find them, since $* refers to the target, not the source. Better use
$< for source files and $@ for target files.
diff --git a/symbols/documentation/Makefile.am b/symbols/documentation/Makefile.am
index a9d68e2..68a45f8 100644
--- a/symbols/documentation/Makefile.am
+++ b/symbols/documentation/Makefile.am
@@ -12,34 +12,34 @@ SUFFIXES = .fig .pic .ps .doc .pdf
.fig.pic:
@echo "Creating pic (using fig2dev)"
@if which fig2dev >/dev/null 2>/dev/null; then \
- fig2dev -L pic $*.fig >$*.pic ;\
+ fig2dev -L pic $< > $@ ;\
else \
echo "** Did not find fig2dev **" ;\
echo "Some documentation might not be correct!";\
- touch $*.pic ;\
+ touch $@ ;\
fi
.doc.ps:
@echo "Creating ps (using groff)"
- @rm -rf $*.tmp
+ @rm -rf $@.tmp
@if test "x$(GROFF)" != xno; then \
- LC_NUMERIC=C $(GROFF) -t -sp -ms $*.doc >$*.tmp ;\
- mv -f $*.tmp $*.ps ;\
+ LC_NUMERIC=C $(GROFF) -t -sp -ms $< > $@.tmp ;\
+ mv -f $@.tmp $@ ;\
else \
echo "** Did not find groff **" ;\
echo "Some Documentation might not be correct!" ;\
- touch $*.ps ;\
+ touch $@ ;\
fi
.ps.pdf:
@echo "Creating pdf (using ps2pdf)"
- @rm -rf $*.pdf
+ @rm -rf $@
@if which ps2pdf >/dev/null 2>/dev/null; then \
- ps2pdf $*.ps ;\
+ ps2pdf $< ;\
else \
echo "** Did not find ps2pdf **" ;\
echo "Some Documentation might not be correct!" ;\
- touch $*.pdf ;\
+ touch $@ ;\
fi
#
commit 5ca5b9768cf70f3d0f905d784d0896c6b442c34f
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Commit: Cesar Strauss <cestrauss@xxxxxxxxx>
build-sys: Check and set Windows-specific flags.
The Windows platform has a native gcc port (MinGW) and a
POSIX compliant one (Cygwin). Both need specific flags to
build correctly.
The rules are:
* On all Windows platforms, pass -no-undefined to libtool.
This allows shared libraries (DLLs) to be built.
* On MinGW, use the -mms-bitfields compiler flag.
This increases compatibility with the MSVC compiler.
* On MinGW, pass -mwindows when linking GUI-only applications.
This avoids opening a text console when running from a shortcut.
diff --git a/configure.ac b/configure.ac
index fc4a775..7a2cb31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,11 +30,10 @@ AX_GIT_VERSION([20090830])
AC_SUBST([CHANGELOG_BASE], [1.0-20070526])
#####################################################################
-# Win32/MinGW support
+# Windows/MinGW/Cygwin support
#####################################################################
-# FIXME complete this
-AC_CANONICAL_HOST
+AX_WINDOWS_FLAGS
#####################################################################
# Check for compiling & linking tools
diff --git a/gattrib/src/Makefile.am b/gattrib/src/Makefile.am
index d5c368d..fed3881 100644
--- a/gattrib/src/Makefile.am
+++ b/gattrib/src/Makefile.am
@@ -34,7 +34,8 @@ gattrib_SOURCES = \
gattrib_CPPFLAGS = -I$(top_srcdir)/libgeda/include \
-I$(srcdir)/../include -I$(top_srcdir) -I$(includedir)
-gattrib_CFLAGS = $(GCC_CFLAGS) $(MINGW_CFLAGS) $(GLIB_CFLAGS) \
+gattrib_CFLAGS = $(GCC_CFLAGS) $(GLIB_CFLAGS) \
+ $(MINGW_CFLAGS) $(MINGW_GUI_CFLAGS) \
$(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
gattrib_LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(GTHREAD_LIBS) \
$(GUILE_LIBS)
diff --git a/gschem/src/Makefile.am b/gschem/src/Makefile.am
index 71a43e4..2cd0d90 100644
--- a/gschem/src/Makefile.am
+++ b/gschem/src/Makefile.am
@@ -69,7 +69,8 @@ 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) $(MINGW_CFLAGS) $(LIBSTROKE_CFLAGS) \
+gschem_CFLAGS = $(GCC_CFLAGS) $(LIBSTROKE_CFLAGS) \
+ $(MINGW_CFLAGS) $(MINGW_GUI_CFLAGS) \
$(GLIB_CFLAGS) $(GTK_CFLAGS) $(GTHREAD_CFLAGS) $(GUILE_CFLAGS)
gschem_LDFLAGS = $(LIBSTROKE_LDFLAGS) $(GLIB_LIBS) $(GTK_LIBS) \
$(GTHREAD_LIBS) $(GUILE_LIBS)
diff --git a/libgeda/src/Makefile.am b/libgeda/src/Makefile.am
index 6b05031..3a20a1c 100644
--- a/libgeda/src/Makefile.am
+++ b/libgeda/src/Makefile.am
@@ -65,7 +65,7 @@ libgeda_la_CFLAGS = \
$(GCC_CFLAGS) $(MINGW_CFLAGS) $(GUILE_CFLAGS) $(GLIB_CFLAGS) \
$(GDK_PIXBUF_CFLAGS)
libgeda_la_LDFLAGS = -version-info $(LIBGEDA_SHLIB_VERSION) \
- $(MINGW_LIBTOOL_FLAGS) $(MINGW_LDFLAGS) $(GUILE_LIBS) \
+ $(WINDOWS_LIBTOOL_FLAGS) $(MINGW_LDFLAGS) $(GUILE_LIBS) \
$(GLIB_LIBS) $(GDK_PIXBUF_LIBS)
LIBTOOL=@LIBTOOL@ --silent
diff --git a/m4/geda-windows.m4 b/m4/geda-windows.m4
new file mode 100644
index 0000000..1e9b45f
--- /dev/null
+++ b/m4/geda-windows.m4
@@ -0,0 +1,71 @@
+# geda-windows.m4 -*-Autoconf-*-
+# serial 1
+
+dnl Check Windows-specific flags
+dnl Copyright (C) 2009 Cesar Strauss <cestrauss@xxxxxxxxx>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+dnl GNU General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+# The Windows platform has a native gcc port (MinGW) and a
+# POSIX compliant one (Cygwin). Both need specific flags to
+# build correctly.
+#
+# The rules are:
+#
+# On all Windows platforms, pass -no-undefined to libtool.
+# This allows shared libraries (DLLs) to be built.
+#
+# On MinGW, use the -mms-bitfields compiler flag.
+# This increases compatibility with the MSVC compiler.
+#
+# On MinGW, pass -mwindows when linking GUI-only applications.
+# This avoids opening a text console when running from a shortcut.
+
+AC_DEFUN([AX_WINDOWS_FLAGS],
+[
+ AC_PREREQ([2.60])dnl
+ AC_REQUIRE([AC_CANONICAL_HOST])dnl
+
+ AC_MSG_CHECKING([for Windows platform])
+ case "$host" in
+ *-*-mingw*|*-*-cygwin*)
+ windows_platform=yes
+ WINDOWS_LIBTOOL_FLAGS=-no-undefined
+ ;;
+ *)
+ windows_platform=no
+ ;;
+ esac
+ AC_MSG_RESULT([$windows_platform])
+
+ AC_MSG_CHECKING([for native Windows])
+ case "$host" in
+ *-*-mingw*)
+ native_windows=yes
+ MINGW_GUI_LDFLAGS=-mwindows
+ MINGW_CFLAGS="-mms-bitfields"
+ ;;
+ *)
+ native_windows=no
+ ;;
+ esac
+ AC_MSG_RESULT([$native_windows])
+
+ AC_SUBST(WINDOWS_LIBTOOL_FLAGS)
+ AC_SUBST(MINGW_GUI_LDFLAGS)
+ AC_SUBST(MINGW_CFLAGS)
+
+]
+)
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs