aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gfsm/gfsm/configure.ac10
-rw-r--r--gfsm/gfsm/gfsm.pc.in2
-rw-r--r--gfsm/gfsm/src/libgfsm/Makefile.am14
-rw-r--r--gfsm/gfsm/src/libgfsm/gnulib/Makefile.in127
4 files changed, 94 insertions, 59 deletions
diff --git a/gfsm/gfsm/configure.ac b/gfsm/gfsm/configure.ac
index a9c6395..9101547 100644
--- a/gfsm/gfsm/configure.ac
+++ b/gfsm/gfsm/configure.ac
@@ -360,11 +360,11 @@ fi
if test "$ac_cv_enable_glib" != "no" ; then
##-- glib: library
- #CFLAGS="$CFLAGS $GLIB_CFLAGS"
- CFLAGS="$CFLAGS `$PKG_CONFIG --cflags glib-2.0`"
- LDFLAGS="$LDFLAGS `$PKG_CONFIG --libs-only-L glib-2.0`"
+ ## + we use "gfsm_CFLAGS" here because CFLAGS gets clobbered if
+ ## we're called from a higher-level Makefile (e.g. pd-extended)
+ gfsm_CFLAGS="$gfsm_CFLAGS `$PKG_CONFIG --cflags glib-2.0`"
+ gfsm_LDFLAGS="$gfsm_LDFLAGS `$PKG_CONFIG --libs-only-L glib-2.0`"
gfsm_LIBS="$gfsm_LIBS `$PKG_CONFIG --libs-only-l glib-2.0`"
- AC_MSG_NOTICE([(DEBUG): CFLAGS="$CFLAGS"])
fi
##
## /glib
@@ -849,6 +849,8 @@ AC_CONFIG_LINKS(src/libgfsm/gfsmConfigNoAuto.h:src/libgfsm/gfsmConfigAuto.h.in)
##vvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvvv
## configuration options
AC_SUBST(CONFIG_OPTIONS)
+AC_SUBST(gfsm_CFLAGS)
+AC_SUBST(gfsm_LDFLAGS)
AC_SUBST(gfsm_LIBS)
## /config options
##^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/gfsm/gfsm/gfsm.pc.in b/gfsm/gfsm/gfsm.pc.in
index 0dd410d..693f90e 100644
--- a/gfsm/gfsm/gfsm.pc.in
+++ b/gfsm/gfsm/gfsm.pc.in
@@ -14,7 +14,7 @@ docdir=@docdir@
pkgdocdir=@pkgdocdir@
build_options=@CONFIG_OPTIONS@
-cflags=@CFLAGS@
+cflags=@CFLAGS@ @gfsm_CFLAGS@
cppflags=-I@spkgincludedir@ @CPPFLAGS@
ldadd=-lgfsm @gfsm_LIBS@
diff --git a/gfsm/gfsm/src/libgfsm/Makefile.am b/gfsm/gfsm/src/libgfsm/Makefile.am
index 8242cab..87893fe 100644
--- a/gfsm/gfsm/src/libgfsm/Makefile.am
+++ b/gfsm/gfsm/src/libgfsm/Makefile.am
@@ -197,12 +197,18 @@ gfsmRegexCompiler.o: gfsmRegexCompiler.c gfsmRegexCompiler.h gfsmRegex.lex.c gfs
## compile flags
##-----------------------------------------------------------------------
-## --- preprocessor flags
+##--- preprocessor flags
#AM_CPPFLAGS =
AM_CPPFLAGS = -I. -I$(SRCDIR)/gnulib
-## --- compiler flags (cc)
-AM_CFLAGS = $(gfsm_WFLAGS) $(gfsm_OFLAGS)
+##--- compiler flags (cc)
+AM_CFLAGS = $(gfsm_WFLAGS) $(gfsm_CFLAGS) $(gfsm_OFLAGS)
+
+##--- linker flags
+AM_LDFLAGS = $(gfsm_LDFLAGS)
+
+##--- libraries
+AM_LIBS = $(gfsm_LIBS)
##-----------------------------------------------------------------------
## Additional variable: library versioning
@@ -233,7 +239,7 @@ LIBREV = $(GFSM_VERSION_MINOR)
#${lib_i}_la_LIBADD = -lotherlib
libgfsm_la_LDFLAGS = -version-info $(LIBCUR):$(LIBREV):$(LIBAGE)
-libgfsm_la_LIBADD = gnulib/libgnu.la @gfsm_LIBS@ $(LIBS)
+#libgfsm_la_LIBADD = gnulib/libgnu.la @gfsm_LIBS@ $(LIBS)
##-----------------------------------------------------------------------
## Variables: cleanup
diff --git a/gfsm/gfsm/src/libgfsm/gnulib/Makefile.in b/gfsm/gfsm/src/libgfsm/gnulib/Makefile.in
index e0948b8..671e4e5 100644
--- a/gfsm/gfsm/src/libgfsm/gnulib/Makefile.in
+++ b/gfsm/gfsm/src/libgfsm/gnulib/Makefile.in
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# 2003, 2004, 2005 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
@@ -25,11 +25,15 @@
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=src/libgfsm/gnulib --m4-base=m4 --aux-dir=config --lgpl --libtool --macro-prefix=gl getdelim vasprintf
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../..
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
@@ -68,18 +72,17 @@ LTLIBRARIES = $(noinst_LTLIBRARIES)
libgnu_la_DEPENDENCIES = @LTLIBOBJS@
am_libgnu_la_OBJECTS =
libgnu_la_OBJECTS = $(am_libgnu_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(top_builddir)/src/libgfsm@am__isrc@
+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/src/libgfsm
depcomp =
am__depfiles_maybe =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
- $(LDFLAGS) -o $@
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
SOURCES = $(libgnu_la_SOURCES)
DIST_SOURCES = $(libgnu_la_SOURCES)
ETAGS = etags
@@ -88,6 +91,8 @@ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ALLOCA = @ALLOCA@
ALLOCA_H = @ALLOCA_H@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -125,6 +130,20 @@ DOC_MAN1_GOGS = @DOC_MAN1_GOGS@
DOC_MAN5_PODS = @DOC_MAN5_PODS@
DOC_PODS = @DOC_PODS@
DOC_PROG_INDEX_SKEL = @DOC_PROG_INDEX_SKEL@
+DOC_WANT_DVI_FALSE = @DOC_WANT_DVI_FALSE@
+DOC_WANT_DVI_TRUE = @DOC_WANT_DVI_TRUE@
+DOC_WANT_HTML_FALSE = @DOC_WANT_HTML_FALSE@
+DOC_WANT_HTML_TRUE = @DOC_WANT_HTML_TRUE@
+DOC_WANT_LATEX_FALSE = @DOC_WANT_LATEX_FALSE@
+DOC_WANT_LATEX_TRUE = @DOC_WANT_LATEX_TRUE@
+DOC_WANT_MAN_FALSE = @DOC_WANT_MAN_FALSE@
+DOC_WANT_MAN_TRUE = @DOC_WANT_MAN_TRUE@
+DOC_WANT_PDF_FALSE = @DOC_WANT_PDF_FALSE@
+DOC_WANT_PDF_TRUE = @DOC_WANT_PDF_TRUE@
+DOC_WANT_PS_FALSE = @DOC_WANT_PS_FALSE@
+DOC_WANT_PS_TRUE = @DOC_WANT_PS_TRUE@
+DOC_WANT_TXT_FALSE = @DOC_WANT_TXT_FALSE@
+DOC_WANT_TXT_TRUE = @DOC_WANT_TXT_TRUE@
DOXYGEN = @DOXYGEN@
DOXYGEN_SOURCES = @DOXYGEN_SOURCES@
DOXY_DEFINES = @DOXY_DEFINES@
@@ -152,7 +171,24 @@ GFSM_VERSION_MINOR = @GFSM_VERSION_MINOR@
GLIB_CFLAGS = @GLIB_CFLAGS@
GLIB_LIBS = @GLIB_LIBS@
GREP = @GREP@
-INSTALL = @INSTALL@
+HAVE_BISON_FALSE = @HAVE_BISON_FALSE@
+HAVE_BISON_TRUE = @HAVE_BISON_TRUE@
+HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@
+HAVE_DOXYGEN_TRUE = @HAVE_DOXYGEN_TRUE@
+HAVE_DOXY_FILTER_FALSE = @HAVE_DOXY_FILTER_FALSE@
+HAVE_DOXY_FILTER_TRUE = @HAVE_DOXY_FILTER_TRUE@
+HAVE_FLEX_FALSE = @HAVE_FLEX_FALSE@
+HAVE_FLEX_TRUE = @HAVE_FLEX_TRUE@
+HAVE_OPTGEN_FALSE = @HAVE_OPTGEN_FALSE@
+HAVE_OPTGEN_TRUE = @HAVE_OPTGEN_TRUE@
+HAVE_POD2HTML_FALSE = @HAVE_POD2HTML_FALSE@
+HAVE_POD2HTML_TRUE = @HAVE_POD2HTML_TRUE@
+HAVE_POD2LATEX_FALSE = @HAVE_POD2LATEX_FALSE@
+HAVE_POD2LATEX_TRUE = @HAVE_POD2LATEX_TRUE@
+HAVE_POD2MAN_FALSE = @HAVE_POD2MAN_FALSE@
+HAVE_POD2MAN_TRUE = @HAVE_POD2MAN_TRUE@
+HAVE_POD2TEXT_FALSE = @HAVE_POD2TEXT_FALSE@
+HAVE_POD2TEXT_TRUE = @HAVE_POD2TEXT_TRUE@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -167,7 +203,6 @@ LIBTOOL = @LIBTOOL@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
-MKDIR_P = @MKDIR_P@
OBJEXT = @OBJEXT@
OPTGEN_PERL = @OPTGEN_PERL@
PACKAGE = @PACKAGE@
@@ -191,13 +226,13 @@ STRIP = @STRIP@
VERSION = @VERSION@
YACC = @YACC@
YFLAGS = @YFLAGS@
-abs_builddir = @abs_builddir@
-abs_srcdir = @abs_srcdir@
-abs_top_builddir = @abs_top_builddir@
-abs_top_srcdir = @abs_top_srcdir@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
@@ -209,12 +244,13 @@ build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
-builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
dvidir = @dvidir@
exec_prefix = @exec_prefix@
+gfsm_CFLAGS = @gfsm_CFLAGS@
+gfsm_LDFLAGS = @gfsm_LDFLAGS@
gfsm_LIBS = @gfsm_LIBS@
gfsm_OFLAGS = @gfsm_OFLAGS@
gfsm_WFLAGS = @gfsm_WFLAGS@
@@ -246,15 +282,12 @@ psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
spkgincludedir = @spkgincludedir@
-srcdir = @srcdir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-top_builddir = @top_builddir@
-top_srcdir = @top_srcdir@
AM_CPPFLAGS = -I. -I.. -I@srcdir@ -I@srcdir@/..
AM_CFLAGS = @gfsm_OFLAGS@ @gfsm_WFLAGS@
AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
@@ -313,7 +346,7 @@ clean-noinstLTLIBRARIES:
rm -f "$${dir}/so_locations"; \
done
libgnu.la: $(libgnu_la_OBJECTS) $(libgnu_la_DEPENDENCIES)
- $(LINK) $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
+ $(LINK) $(libgnu_la_LDFLAGS) $(libgnu_la_OBJECTS) $(libgnu_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -336,6 +369,10 @@ mostlyclean-libtool:
clean-libtool:
-rm -rf .libs _libs
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
@@ -385,21 +422,22 @@ distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- list='$(DISTFILES)'; \
- dist_files=`for file in $$list; do echo $$file; done | \
- sed -e "s|^$$srcdirstrip/||;t" \
- -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
- case $$dist_files in \
- */*) $(MKDIR_P) `echo "$$dist_files" | \
- sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
- sort -u` ;; \
- esac; \
- for file in $$dist_files; do \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+ list='$(DISTFILES)'; for file in $$list; do \
+ case $$file in \
+ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+ esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+ dir="/$$dir"; \
+ $(mkdir_p) "$(distdir)$$dir"; \
+ else \
+ dir=''; \
+ fi; \
if test -d $$d/$$file; then \
- dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -453,7 +491,7 @@ clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
distclean: distclean-am
-rm -f Makefile
distclean-am: clean-am distclean-compile distclean-generic \
- distclean-tags
+ distclean-libtool distclean-tags
dvi: dvi-am
@@ -467,20 +505,12 @@ info-am:
install-data-am:
-install-dvi: install-dvi-am
-
install-exec-am:
-install-html: install-html-am
-
install-info: install-info-am
install-man:
-install-pdf: install-pdf-am
-
-install-ps: install-ps-am
-
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -500,22 +530,19 @@ ps: ps-am
ps-am:
-uninstall-am:
-
-.MAKE: install-am install-strip
+uninstall-am: uninstall-info-am
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool clean-noinstLTLIBRARIES ctags distclean \
distclean-compile distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-dvi \
- install-dvi-am install-exec install-exec-am install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
+ install install-am install-data install-data-am install-exec \
+ install-exec-am install-info install-info-am install-man \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
- pdf pdf-am ps ps-am tags uninstall uninstall-am
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am
# We need the following in order to create <alloca.h> when the system
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 07:04:20 +0000