[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.1.2.20070818-112-gae22515)
The branch, master has been updated
via ae225157603f063747709fa3d639ed8cdf63f6b1 (commit)
via 43b571362e5fb663115ee1630b94c88cb74f0c13 (commit)
via 0b34786f4d28b57854f5cc4851afa40ac44b4ac3 (commit)
via 8d60088eafd1a1447db10e14436e9bbc3a5a28ce (commit)
via bdd7ef7ee9047c3942b43c165396ebe48d31e95a (commit)
via 40c0582e39d6a7ed0a41e0e5deedc0bfd03bbddc (commit)
via 4698fd163892243b931fbd7795ad9443f5b2fe58 (commit)
via bde766abee9fe21857ef3c81bebc5a90c18bd315 (commit)
via d715ba7dc3e02d77e671b9ab54b994379daefec5 (commit)
from 1abfd25bf917ee4e90ccdbbbe9921db6ff46c49f (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 | 9 +--------
gattrib/src/.gitignore | 1 +
gnetlist/configure.ac | 6 ------
gnetlist/src/.gitignore | 1 +
gnetlist/src/gnetlist.c | 7 +------
gnetlist/src/s_hierarchy.c | 4 ++--
gnetlist/utils/.gitignore | 1 +
gschem/configure.ac.in | 8 +-------
gschem/src/.gitignore | 1 +
gschem/src/gschem.c | 7 +------
gschem/src/o_misc.c | 4 ++++
gsymcheck/configure.ac | 6 ------
gsymcheck/src/.gitignore | 1 +
gsymcheck/src/gsymcheck.c | 7 +------
gsymcheck/src/s_check.c | 2 +-
libgeda/configure.ac | 8 +-------
libgeda/scheme/Makefile.am | 2 +-
libgeda/src/f_basic.c | 6 ++++++
symbols/Makefile.am | 4 ++--
symbols/configure.ac | 6 ------
utils/configure.ac | 11 +----------
utils/gschlas/.gitignore | 1 +
utils/gschlas/gschlas.c | 7 +------
utils/src/.gitignore | 7 +++++++
utils/src/Makefile.am | 7 ++-----
25 files changed, 39 insertions(+), 85 deletions(-)
=================
Commit Messages
=================
commit 43b571362e5fb663115ee1630b94c88cb74f0c13
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 18:24:10 2007 -0200
Replace index and rindex by strchr and strrchr.
These are functionally equivalent, and more portable to MinGW.
:100644 100644 cc29d7d... b6c8b0c... M gnetlist/src/s_hierarchy.c
:100644 100644 29f964f... 6e936fe... M gsymcheck/src/s_check.c
commit 0b34786f4d28b57854f5cc4851afa40ac44b4ac3
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Fri Nov 16 09:33:52 2007 -0200
MinGW does not have getuid nor getgid.
:100644 100644 bc7dfe0... b232739... M gschem/configure.ac.in
:100644 100644 54052ce... 019fe6c... M gschem/src/o_misc.c
commit 8d60088eafd1a1447db10e14436e9bbc3a5a28ce
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 14:37:53 2007 -0200
MinGW does not have symlinks.
:100644 100644 331fd4a... 937e41b... M libgeda/src/f_basic.c
commit bdd7ef7ee9047c3942b43c165396ebe48d31e95a
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 14:17:21 2007 -0200
Use g_path_is_absolute from GLIB instead of platform specific code.
:100644 100644 77fc97a... b992fd4... M gnetlist/src/gnetlist.c
:100644 100644 91ea7de... 8188354... M gschem/src/gschem.c
:100644 100644 12601a4... e7c76f7... M gsymcheck/src/gsymcheck.c
:100644 100644 11a8b25... 03184c0... M utils/gschlas/gschlas.c
commit 40c0582e39d6a7ed0a41e0e5deedc0bfd03bbddc
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Thu Nov 15 19:11:12 2007 -0200
Use forward slashes as path separators on MinGW.
They are also acceptable as path separators on MinGW.
:100644 100644 fea2f3b... 203332a... M gattrib/configure.ac
:100644 100644 fbe6e50... 2cacc4f... M gnetlist/configure.ac
:100644 100644 4e0a882... bc7dfe0... M gschem/configure.ac.in
:100644 100644 5da5c2d... e43cfd1... M gsymcheck/configure.ac
:100644 100644 efa73a9... 6c71b6b... M libgeda/configure.ac
:100644 100644 5073d21... 5f8d7b1... M libgeda/scheme/Makefile.am
:100644 100644 048df70... 465737f... M symbols/Makefile.am
:100644 100644 73646c4... 1c2afad... M symbols/configure.ac
:100644 100644 feba08b... e797269... M utils/configure.ac
commit 4698fd163892243b931fbd7795ad9443f5b2fe58
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 13:38:26 2007 -0200
Remove uneeded MinGW-only libraries.
:100644 100644 68b5267... efa73a9... M libgeda/configure.ac
:100644 100644 48bf556... feba08b... M utils/configure.ac
:100644 100644 e7f3391... dabeef6... M utils/src/Makefile.am
commit bde766abee9fe21857ef3c81bebc5a90c18bd315
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sat Nov 10 17:45:13 2007 -0200
Tell git to ignore the ylwrap file.
:100644 100644 5979c37... a6c1b63... M utils/.gitignore
commit d715ba7dc3e02d77e671b9ab54b994379daefec5
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Thu Nov 15 13:34:40 2007 -0200
Tell git to ignore .exe files.
:100644 100644 3c429b6... c4e3f85... M gattrib/src/.gitignore
:100644 100644 e0cc45e... 3357986... M gnetlist/src/.gitignore
:100644 100644 38f717c... 96d5848... M gnetlist/utils/.gitignore
:100644 100644 136f423... 239df5f... M gschem/src/.gitignore
:100644 100644 c2b454c... 4f736c3... M gsymcheck/src/.gitignore
:100644 100644 9ccdc06... a2b5266... M utils/gschlas/.gitignore
:100644 100644 5352d68... 1506323... M utils/src/.gitignore
=========
Changes
=========
commit 43b571362e5fb663115ee1630b94c88cb74f0c13
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 18:24:10 2007 -0200
Replace index and rindex by strchr and strrchr.
These are functionally equivalent, and more portable to MinGW.
diff --git a/gnetlist/src/s_hierarchy.c b/gnetlist/src/s_hierarchy.c
index cc29d7d..b6c8b0c 100644
--- a/gnetlist/src/s_hierarchy.c
+++ b/gnetlist/src/s_hierarchy.c
@@ -604,7 +604,7 @@ char *s_hierarchy_return_baseuref(TOPLEVEL * pr_current, char *uref)
if (pr_current->hierarchy_uref_order == APPEND) {
- start_of_base = rindex(uref, '/'); /* separator is always '/' */
+ start_of_base = strrchr(uref, '/'); /* separator is always '/' */
if (start_of_base == NULL) {
return (g_strdup (uref));
@@ -614,7 +614,7 @@ char *s_hierarchy_return_baseuref(TOPLEVEL * pr_current, char *uref)
} else if (pr_current->hierarchy_uref_order == PREPEND) {
- end_of_base = index(uref, '/');
+ end_of_base = strchr(uref, '/');
if (end_of_base == NULL) {
return (g_strdup (uref));
diff --git a/gsymcheck/src/s_check.c b/gsymcheck/src/s_check.c
index 29f964f..6e936fe 100644
--- a/gsymcheck/src/s_check.c
+++ b/gsymcheck/src/s_check.c
@@ -686,7 +686,7 @@ s_check_slotdef(OBJECT *object_head, SYMCHECK *s_current)
}
/* skip over the : */
- pins = index(slotdef, ':');
+ pins = strchr(slotdef, ':');
if (!pins) {
message = g_strdup_printf (
"Invalid slotdef=%s attributes, not continuing\n",
commit 0b34786f4d28b57854f5cc4851afa40ac44b4ac3
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Fri Nov 16 09:33:52 2007 -0200
MinGW does not have getuid nor getgid.
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index bc7dfe0..b232739 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -390,7 +390,7 @@ AC_C_CONST
# Checks for library functions.
AC_TYPE_SIGNAL
-AC_CHECK_FUNCS(getcwd strstr vsnprintf snprintf)
+AC_CHECK_FUNCS(getcwd strstr vsnprintf snprintf getuid getgid)
AC_MSG_CHECKING([for optarg in unistd.h])
AC_TRY_COMPILE(
diff --git a/gschem/src/o_misc.c b/gschem/src/o_misc.c
index 54052ce..019fe6c 100644
--- a/gschem/src/o_misc.c
+++ b/gschem/src/o_misc.c
@@ -1199,13 +1199,16 @@ void o_autosave_backups(GSCHEM_TOPLEVEL *w_current)
*/
if (stat (real_filename, &st) != 0) {
+#if defined(HAVE_GETUID) && defined(HAVE_GETGID)
struct stat dir_st;
int result;
+#endif
/* Use default permissions */
saved_umask = umask(0);
st.st_mode = 0666 & ~saved_umask;
umask(saved_umask);
+#if defined(HAVE_GETUID) && defined(HAVE_GETGID)
st.st_uid = getuid ();
result = stat (dirname, &dir_st);
@@ -1214,6 +1217,7 @@ void o_autosave_backups(GSCHEM_TOPLEVEL *w_current)
st.st_gid = dir_st.st_gid;
else
st.st_gid = getgid ();
+#endif
}
g_free (dirname);
g_free (only_filename);
commit 8d60088eafd1a1447db10e14436e9bbc3a5a28ce
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 14:37:53 2007 -0200
MinGW does not have symlinks.
diff --git a/libgeda/src/f_basic.c b/libgeda/src/f_basic.c
index 331fd4a..937e41b 100644
--- a/libgeda/src/f_basic.c
+++ b/libgeda/src/f_basic.c
@@ -446,6 +446,11 @@ char *follow_symlinks (const gchar *filename, GError **error)
followed_filename = g_strdup (filename);
link_count = 0;
+#ifdef __MINGW32__
+ /* MinGW does not have symlinks */
+ return followed_filename;
+#else
+
while (link_count < MAX_LINK_LEVEL) {
struct stat st;
@@ -510,4 +515,5 @@ char *follow_symlinks (const gchar *filename, GError **error)
fprintf(stderr, "The file has too many symbolic links.");
return NULL;
+#endif /* __MINGW32__ */
}
commit bdd7ef7ee9047c3942b43c165396ebe48d31e95a
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 14:17:21 2007 -0200
Use g_path_is_absolute from GLIB instead of platform specific code.
diff --git a/gnetlist/src/gnetlist.c b/gnetlist/src/gnetlist.c
index 77fc97a..b992fd4 100644
--- a/gnetlist/src/gnetlist.c
+++ b/gnetlist/src/gnetlist.c
@@ -227,12 +227,7 @@ void main_prog(void *closure, int argc, char *argv[])
while (argv[i] != NULL) {
gchar *filename;
-#ifdef __MINGW32__
- if (argv[i][1] == ':' && (argv[i][2] == G_DIR_SEPARATOR ||
- argv[i][2] == OTHER_PATH_SEPARATER_CHAR))
-#else
- if (argv[i][0] == G_DIR_SEPARATOR)
-#endif
+ if (g_path_is_absolute(argv[i]))
{
/* Path is already absolute so no need to do any concat of cwd */
filename = g_strdup (argv[i]);
diff --git a/gschem/src/gschem.c b/gschem/src/gschem.c
index 91ea7de..8188354 100644
--- a/gschem/src/gschem.c
+++ b/gschem/src/gschem.c
@@ -278,12 +278,7 @@ void main_prog(void *closure, int argc, char *argv[])
i = argv_index;
while (argv[i] != NULL) {
-#ifdef __MINGW32__
- if (argv[i][1] == ':' && (argv[i][2] == G_DIR_SEPARATOR ||
- argv[i][2] == OTHER_PATH_SEPARATER_CHAR))
-#else
- if (argv[i][0] == G_DIR_SEPARATOR)
-#endif
+ if (g_path_is_absolute(argv[i]))
{
/* Path is already absolute so no need to do any concat of cwd */
filename = g_strdup (argv[i]);
diff --git a/gsymcheck/src/gsymcheck.c b/gsymcheck/src/gsymcheck.c
index 12601a4..e7c76f7 100644
--- a/gsymcheck/src/gsymcheck.c
+++ b/gsymcheck/src/gsymcheck.c
@@ -106,12 +106,7 @@ main_prog(void *closure, int argc, char *argv[])
while (argv[i] != NULL) {
gchar *filename;
-#ifdef __MINGW32__
- if (argv[i][1] == ':' && (argv[i][2] == G_DIR_SEPARATOR ||
- argv[i][2] == OTHER_PATH_SEPARATER_CHAR))
-#else
- if (argv[i][0] == G_DIR_SEPARATOR)
-#endif
+ if (g_path_is_absolute(argv[i]))
{
/* Path is already absolute so no need to do any concat of cwd */
filename = g_strdup (argv[i]);
diff --git a/utils/gschlas/gschlas.c b/utils/gschlas/gschlas.c
index 11a8b25..03184c0 100644
--- a/utils/gschlas/gschlas.c
+++ b/utils/gschlas/gschlas.c
@@ -106,12 +106,7 @@ main_prog(void *closure, int argc, char *argv[])
while (argv[i] != NULL) {
gchar *filename;
-#ifdef __MINGW32__
- if (argv[i][1] == ':' && (argv[i][2] == G_DIR_SEPARATOR ||
- argv[i][2] == OTHER_PATH_SEPARATER_CHAR))
-#else
- if (argv[i][0] == G_DIR_SEPARATOR)
-#endif
+ if (g_path_is_absolute(argv[i]))
{
/* Path is already absolute so no need to do any concat of cwd */
filename = g_strdup (argv[i]);
commit 40c0582e39d6a7ed0a41e0e5deedc0bfd03bbddc
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Thu Nov 15 19:11:12 2007 -0200
Use forward slashes as path separators on MinGW.
They are also acceptable as path separators on MinGW.
diff --git a/gattrib/configure.ac b/gattrib/configure.ac
index fea2f3b..203332a 100644
--- a/gattrib/configure.ac
+++ b/gattrib/configure.ac
@@ -38,8 +38,7 @@ AC_PATH_PROGS(AWK, nawk gawk mawk awk, )
#########################################################################
#
# Misc win32 / mingw checks and variables start
-# Win32 stuff currently unsupported by SDB. I left it in because we need
-# to set the PATHSEP var.
+# Win32 stuff currently unsupported by SDB.
AC_CANONICAL_HOST
# Figure out if we are building on win32 and what environment.
@@ -49,13 +48,9 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
@@ -384,8 +379,6 @@ AC_SUBST(GATTRIB_CFLAGS)
AC_SUBST(GATTRIB_LDFLAGS)
AC_SUBST(GEDARCDIR)
AC_SUBST(GEDADATADIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
# Create all the necessary derived files
AC_CONFIG_FILES([Makefile
diff --git a/gnetlist/configure.ac b/gnetlist/configure.ac
index fbe6e50..2cacc4f 100644
--- a/gnetlist/configure.ac
+++ b/gnetlist/configure.ac
@@ -127,13 +127,9 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
@@ -425,8 +421,6 @@ AC_SUBST(GNETLIST_CFLAGS)
AC_SUBST(GNETLIST_LDFLAGS)
AC_SUBST(GEDARCDIR)
AC_SUBST(GEDADATADIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
# Create all the necessary derived files
AC_CONFIG_FILES([Makefile
diff --git a/gschem/configure.ac.in b/gschem/configure.ac.in
index 4e0a882..bc7dfe0 100644
--- a/gschem/configure.ac.in
+++ b/gschem/configure.ac.in
@@ -46,13 +46,9 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
@@ -524,8 +520,6 @@ AC_SUBST(GSCHEM_CFLAGS)
AC_SUBST(GSCHEM_LDFLAGS)
AC_SUBST(GEDADATADIR)
AC_SUBST(GEDARCDIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
AC_SUBST(GUILEINTERP)
AC_SUBST(INDENT)
diff --git a/gsymcheck/configure.ac b/gsymcheck/configure.ac
index 5da5c2d..e43cfd1 100644
--- a/gsymcheck/configure.ac
+++ b/gsymcheck/configure.ac
@@ -40,13 +40,9 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
@@ -288,8 +284,6 @@ AC_SUBST(GSYMCHECK_CFLAGS)
AC_SUBST(GSYMCHECK_LDFLAGS)
AC_SUBST(GEDARCDIR)
AC_SUBST(GEDADATADIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
# Create all the necessary derived files
AC_CONFIG_FILES([Makefile
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
index efa73a9..6c71b6b 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -40,14 +40,10 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW_CFLAGS="-mms-bitfields -mwindows"
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW_CFLAGS=
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
diff --git a/libgeda/scheme/Makefile.am b/libgeda/scheme/Makefile.am
index 5073d21..5f8d7b1 100644
--- a/libgeda/scheme/Makefile.am
+++ b/libgeda/scheme/Makefile.am
@@ -1,5 +1,5 @@
-scmdatadir = @GEDADATADIR@@PATHSEP@scheme
+scmdatadir = @GEDADATADIR@/scheme
dist_scmdata_DATA = geda.scm
MOSTLYCLEANFILES = *.log *~
diff --git a/symbols/Makefile.am b/symbols/Makefile.am
index 048df70..465737f 100644
--- a/symbols/Makefile.am
+++ b/symbols/Makefile.am
@@ -6,10 +6,10 @@ SUBDIRS = \
opto diode relay vhdl power philips transistor switcap cascade \
asic asicpads gnetman minicircuits st apex allegro irf documentation
-scmdatadir = @GEDADATADIR@@PATHSEP@scheme
+scmdatadir = @GEDADATADIR@/scheme
dist_scmdata_DATA = geda-font.scm
-gafrcddir = @GEDADATADIR@@PATHSEP@xxxxxxx
+gafrcddir = @GEDADATADIR@/gafrc.d
dist_gafrcd_DATA = geda-clib.scm
EXTRA_DIST = autogen.sh ChangeLog-1.0
diff --git a/symbols/configure.ac b/symbols/configure.ac
index 73646c4..1c2afad 100644
--- a/symbols/configure.ac
+++ b/symbols/configure.ac
@@ -35,13 +35,9 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
@@ -177,8 +173,6 @@ AC_SUBST(DOTTED_VERSION)
AC_SUBST(GEDADATADIR)
AC_SUBST(GEDADOCDIR)
AC_SUBST(GEDARCDIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
AC_CONFIG_FILES([
Makefile
diff --git a/utils/configure.ac b/utils/configure.ac
index feba08b..e797269 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -76,14 +76,10 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW_CFLAGS="-mms-bitfields -mwindows"
MINGW="yes"
- PATHSEP=\\\\
- OTHERPATHSEP=/
else
# Unix host
MINGW_CFLAGS=
MINGW="no"
- PATHSEP=/
- OTHERPATHSEP=\\\\
fi
#
@@ -456,8 +452,6 @@ AC_SUBST(MINGW_CFLAGS)
AC_SUBST(GEDARCDIR)
AC_SUBST(GEDADATADIR)
AC_SUBST(GEDADOCDIR)
-AC_SUBST(PATHSEP)
-AC_SUBST(OTHERPATHSEP)
# Create all the necessary derived files
AC_CONFIG_FILES([Makefile
commit 4698fd163892243b931fbd7795ad9443f5b2fe58
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sun Nov 11 13:38:26 2007 -0200
Remove uneeded MinGW-only libraries.
diff --git a/libgeda/configure.ac b/libgeda/configure.ac
index 68b5267..efa73a9 100644
--- a/libgeda/configure.ac
+++ b/libgeda/configure.ac
@@ -39,14 +39,12 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW_CFLAGS="-mms-bitfields -mwindows"
- MINGW_LIBS="-lregex -liberty"
MINGW="yes"
PATHSEP=\\\\
OTHERPATHSEP=/
else
# Unix host
MINGW_CFLAGS=
- MINGW_LIBS=
MINGW="no"
PATHSEP=/
OTHERPATHSEP=\\\\
@@ -427,7 +425,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
# Finally create the final CFLAGS and LDFLAGS for use in the makefiles
LIBGEDA_CFLAGS="$MINGW_CFLAGS $GUILE_CFLAGS $GTK_CFLAGS $X_CFLAGS $GDK_PIXBUF_CFLAGS $GDK_CFLAGS"
-LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $MINGW_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS $GDK_LIBS"
+LIBGEDA_LDFLAGS="$GUILE_LDFLAGS $GLIB_LIBS $DMALLOC_LIBS $GDK_PIXBUF_LIBS $GDK_LIBS"
LIBTOOL_FLAGS="-version-info $SHARED_LIBRARY_VERSION"
# Makefile.in variable substitution
diff --git a/utils/configure.ac b/utils/configure.ac
index 48bf556..feba08b 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -75,14 +75,12 @@ esac
if ! test "$MINGW" = "no" -o "$MINGW"x = x; then
MINGW_CFLAGS="-mms-bitfields -mwindows"
- MINGW_LIBS="-lregex -liberty"
MINGW="yes"
PATHSEP=\\\\
OTHERPATHSEP=/
else
# Unix host
MINGW_CFLAGS=
- MINGW_LIBS=
MINGW="no"
PATHSEP=/
OTHERPATHSEP=\\\\
@@ -441,7 +439,7 @@ AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of this program's package])
GSCHLAS_CFLAGS="$LIBGEDA_CFLAGS"
GSCHLAS_LDFLAGS="$LIBGEDA_LIBS $GTK_LIBS"
GSCH2PCB_CFLAGS="$GLIB_CFLAGS $MINGW_CFLAGS"
-GSCH2PCB_LDFLAGS="$GLIB_LIBS $MINGW_LIBS"
+GSCH2PCB_LDFLAGS="$GLIB_LIBS"
GRENUM_CFLAGS="$LIBGEDA_CFLAGS"
GRENUM_LDFLAGS="$GLIB_LIBS"
@@ -455,7 +453,6 @@ AC_SUBST(GSCH2PCB_LDFLAGS)
AC_SUBST(GRENUM_CFLAGS)
AC_SUBST(GRENUM_LDFLAGS)
AC_SUBST(MINGW_CFLAGS)
-AC_SUBST(MINGW_LIBS)
AC_SUBST(GEDARCDIR)
AC_SUBST(GEDADATADIR)
AC_SUBST(GEDADOCDIR)
diff --git a/utils/src/Makefile.am b/utils/src/Makefile.am
index e7f3391..dabeef6 100644
--- a/utils/src/Makefile.am
+++ b/utils/src/Makefile.am
@@ -24,11 +24,8 @@ olib_CFLAGS = @MINGW_CFLAGS@
gsch2pcb_CFLAGS = @GSCH2PCB_CFLAGS@
grenum_CFLAGS = @GRENUM_CFLAGS@
-gmk_sym_LDADD = @MINGW_LIBS@
-smash_megafile_LDADD = @MINGW_LIBS@
-convert_sym_LDADD = @MINGW_LIBS@ -lm
-sarlacc_schem_LDADD = @MINGW_LIBS@
-olib_LDADD = @MINGW_LIBS@ -lm
+convert_sym_LDADD = -lm
+olib_LDADD = -lm
gsch2pcb_LDADD = @GSCH2PCB_LDFLAGS@
grenum_LDADD = @GRENUM_LDFLAGS@
commit bde766abee9fe21857ef3c81bebc5a90c18bd315
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Sat Nov 10 17:45:13 2007 -0200
Tell git to ignore the ylwrap file.
diff --git a/utils/.gitignore b/utils/.gitignore
index 5979c37..a6c1b63 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -16,3 +16,4 @@ missing
mkinstalldirs
compile
*~
+ylwrap
commit d715ba7dc3e02d77e671b9ab54b994379daefec5
Author: Cesar Strauss <cestrauss@xxxxxxxxx>
Date: Thu Nov 15 13:34:40 2007 -0200
Tell git to ignore .exe files.
diff --git a/gattrib/src/.gitignore b/gattrib/src/.gitignore
index 3c429b6..c4e3f85 100644
--- a/gattrib/src/.gitignore
+++ b/gattrib/src/.gitignore
@@ -2,5 +2,6 @@
Makefile
Makefile.in
gattrib
+gattrib.exe
*.o
*~
diff --git a/gnetlist/src/.gitignore b/gnetlist/src/.gitignore
index e0cc45e..3357986 100644
--- a/gnetlist/src/.gitignore
+++ b/gnetlist/src/.gitignore
@@ -2,5 +2,6 @@ Makefile
Makefile.in
.deps
gnetlist
+gnetlist.exe
*.o
*~
diff --git a/gnetlist/utils/.gitignore b/gnetlist/utils/.gitignore
index 38f717c..96d5848 100644
--- a/gnetlist/utils/.gitignore
+++ b/gnetlist/utils/.gitignore
@@ -2,5 +2,6 @@ Makefile
Makefile.in
.deps
mk_verilog_syms
+mk_verilog_syms.exe
*.o
*~
diff --git a/gschem/src/.gitignore b/gschem/src/.gitignore
index 136f423..239df5f 100644
--- a/gschem/src/.gitignore
+++ b/gschem/src/.gitignore
@@ -2,5 +2,6 @@
Makefile
Makefile.in
gschem
+gschem.exe
*.o
*~
diff --git a/gsymcheck/src/.gitignore b/gsymcheck/src/.gitignore
index c2b454c..4f736c3 100644
--- a/gsymcheck/src/.gitignore
+++ b/gsymcheck/src/.gitignore
@@ -2,5 +2,6 @@ Makefile
Makefile.in
.deps
gsymcheck
+gsymcheck.exe
*.o
*~
diff --git a/utils/gschlas/.gitignore b/utils/gschlas/.gitignore
index 9ccdc06..a2b5266 100644
--- a/utils/gschlas/.gitignore
+++ b/utils/gschlas/.gitignore
@@ -2,5 +2,6 @@ Makefile
Makefile.in
.deps
gschlas
+gschlas.exe
*.o
*~
diff --git a/utils/src/.gitignore b/utils/src/.gitignore
index 5352d68..1506323 100644
--- a/utils/src/.gitignore
+++ b/utils/src/.gitignore
@@ -11,3 +11,10 @@ gsch2pcb
grenum
*.o
*~
+convert_sym.exe
+sarlacc_schem.exe
+gmk_sym.exe
+smash_megafile.exe
+olib.exe
+grenum.exe
+gsch2pcb.exe
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs