gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-279-gde5f435)

[git@xxxxxxxxxx]

The branch, master has been updated
       via  de5f435b2dcedd048fa2e941827b0ebac231a299 (commit)
      from  3a748314907a0167fc06fe08be498f40c6c7f318 (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
=========

 utils/configure.ac    |   15 ++++++++++++---
 utils/src/Makefile.am |   14 +++++++-------
 2 files changed, 19 insertions(+), 10 deletions(-)


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

commit de5f435b2dcedd048fa2e941827b0ebac231a299
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sat Nov 1 17:46:53 2008 +0000

    utils: Adjust Makefile.am so we add $(AM_CFLAGS) to {appname}_CFLAGS
    
    This allows us to add CFLAGS to all targets from the AM_CFLAGS variable.
    
    Also export app-specific CFLAGS from configure.ac for gmk_sym,
    smash_megafile, convert_sym, sarlacc_schem and olib rather than
    copying those for gschlas inside Makefile.am. This keeps things
    cleaner should either set of CFLAGS need to change in the future.

:100644 100644 5288702... 17587e9... M	utils/configure.ac
:100644 100644 12ba8d3... 5154792... M	utils/src/Makefile.am

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

commit de5f435b2dcedd048fa2e941827b0ebac231a299
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date:   Sat Nov 1 17:46:53 2008 +0000

    utils: Adjust Makefile.am so we add $(AM_CFLAGS) to {appname}_CFLAGS
    
    This allows us to add CFLAGS to all targets from the AM_CFLAGS variable.
    
    Also export app-specific CFLAGS from configure.ac for gmk_sym,
    smash_megafile, convert_sym, sarlacc_schem and olib rather than
    copying those for gschlas inside Makefile.am. This keeps things
    cleaner should either set of CFLAGS need to change in the future.

diff --git a/utils/configure.ac b/utils/configure.ac
index 5288702..17587e9 100644
--- a/utils/configure.ac
+++ b/utils/configure.ac
@@ -450,22 +450,31 @@ 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"  
+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"
 GSCH2PCB_LDFLAGS="$GLIB_LIBS"
 GRENUM_CFLAGS="$LIBGEDA_CFLAGS"
-GRENUM_LDFLAGS="$GLIB_LIBS"  
+GRENUM_LDFLAGS="$GLIB_LIBS"
 
 # Makefile.in variable substitution
 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)
 AC_SUBST(GRENUM_LDFLAGS)
-AC_SUBST(MINGW_CFLAGS)
 AC_SUBST(GEDARCDIR)
 AC_SUBST(GEDADATADIR)
 AC_SUBST(GEDADOCDIR)
diff --git a/utils/src/Makefile.am b/utils/src/Makefile.am
index 12ba8d3..5154792 100644
--- a/utils/src/Makefile.am
+++ b/utils/src/Makefile.am
@@ -16,13 +16,13 @@ olib_SOURCES = olib.l geda_sym_format.h
 gsch2pcb_SOURCES = gsch2pcb.c
 grenum_SOURCES = grenum.c grenum.h
 
-gmk_sym_CFLAGS = @MINGW_CFLAGS@
-smash_megafile_CFLAGS = @MINGW_CFLAGS@
-convert_sym_CFLAGS = @GSCHLAS_CFLAGS@
-sarlacc_schem_CFLAGS = @GSCHLAS_CFLAGS@
-olib_CFLAGS = @MINGW_CFLAGS@
-gsch2pcb_CFLAGS = @GSCH2PCB_CFLAGS@
-grenum_CFLAGS = @GRENUM_CFLAGS@
+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)
 
 convert_sym_LDADD = -lm
 olib_LDADD = -lm




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