Permalink
Browse files

fixed compilation problems at linking stage

  • Loading branch information...
Ashley Newson
Ashley Newson committed Sep 4, 2012
1 parent 3b11cf8 commit 127703f731933818b1154c661cdd1d9ad34f906e
Showing with 28 additions and 25 deletions.
  1. +20 −20 autom4te.cache/requests
  2. +1 −1 ccode/Makefile.am
  3. +7 −4 ccode/Makefile.in
View
@@ -15,55 +15,55 @@
'configure.ac'
],
{
- '_LT_AC_TAGCONFIG' => 1,
'AM_PROG_F77_C_O' => 1,
- 'AC_INIT' => 1,
+ '_LT_AC_TAGCONFIG' => 1,
'm4_pattern_forbid' => 1,
- 'AC_CANONICAL_TARGET' => 1,
+ 'AC_INIT' => 1,
'_AM_COND_IF' => 1,
- 'AC_CONFIG_LIBOBJ_DIR' => 1,
+ 'AC_CANONICAL_TARGET' => 1,
'AC_SUBST' => 1,
- 'AC_CANONICAL_HOST' => 1,
+ 'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_FC_SRCEXT' => 1,
+ 'AC_CANONICAL_HOST' => 1,
'AC_PROG_LIBTOOL' => 1,
'AM_INIT_AUTOMAKE' => 1,
- 'AC_CONFIG_SUBDIRS' => 1,
'AM_PATH_GUILE' => 1,
+ 'AC_CONFIG_SUBDIRS' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'LT_CONFIG_LTDL_DIR' => 1,
- 'AC_REQUIRE_AUX_FILE' => 1,
'AC_CONFIG_LINKS' => 1,
- 'LT_SUPPORTED_TAG' => 1,
+ 'AC_REQUIRE_AUX_FILE' => 1,
'm4_sinclude' => 1,
+ 'LT_SUPPORTED_TAG' => 1,
'AM_MAINTAINER_MODE' => 1,
'AM_NLS' => 1,
'AM_GNU_GETTEXT_INTL_SUBDIR' => 1,
- '_m4_warn' => 1,
'AM_MAKEFILE_INCLUDE' => 1,
+ '_m4_warn' => 1,
'AM_PROG_CXX_C_O' => 1,
- '_AM_COND_ENDIF' => 1,
'_AM_MAKEFILE_INCLUDE' => 1,
+ '_AM_COND_ENDIF' => 1,
'AM_ENABLE_MULTILIB' => 1,
'AM_PROG_MOC' => 1,
'AM_SILENT_RULES' => 1,
'AC_CONFIG_FILES' => 1,
- 'include' => 1,
'LT_INIT' => 1,
- 'AM_PROG_AR' => 1,
+ 'include' => 1,
'AM_GNU_GETTEXT' => 1,
+ 'AM_PROG_AR' => 1,
'AC_LIBSOURCE' => 1,
- 'AC_CANONICAL_BUILD' => 1,
'AM_PROG_FC_C_O' => 1,
+ 'AC_CANONICAL_BUILD' => 1,
'AC_FC_FREEFORM' => 1,
'AH_OUTPUT' => 1,
- '_AM_SUBST_NOTMAKE' => 1,
'AC_CONFIG_AUX_DIR' => 1,
- 'AM_PROG_CC_C_O' => 1,
- 'sinclude' => 1,
+ '_AM_SUBST_NOTMAKE' => 1,
'm4_pattern_allow' => 1,
- 'AM_CONDITIONAL' => 1,
- 'AC_CANONICAL_SYSTEM' => 1,
+ 'sinclude' => 1,
+ 'AM_PROG_CC_C_O' => 1,
'AM_XGETTEXT_OPTION' => 1,
+ 'AC_CANONICAL_SYSTEM' => 1,
+ 'AM_CONDITIONAL' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AM_POT_TOOLS' => 1,
@@ -136,9 +136,9 @@
'AM_SET_LEADING_DOT' => 1,
'AM_SET_DEPDIR' => 1,
'_AM_DEPENDENCIES' => 1,
- 'm4_include' => 1,
- 'PKG_PROG_PKG_CONFIG' => 1,
'AM_PROG_INSTALL_SH' => 1,
+ 'PKG_PROG_PKG_CONFIG' => 1,
+ 'm4_include' => 1,
'PKG_CHECK_MODULES' => 1,
'_AC_AM_CONFIG_HEADER_HOOK' => 1,
'AU_DEFUN' => 1,
View
@@ -69,5 +69,5 @@ DEF_CFLAGS = \
-DPACKAGE_DATADIR=\"$(pkgdatadir)/\" \
-DPACKAGE_VERSION=\"$(VERSION)\"
-smartsim_LDFLAGS= $(GLIB_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(LIBRSVG_LIBS) $(LIBXML_LIBS)
+smartsim_LDADD= $(GLIB_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(LIBRSVG_LIBS) $(LIBXML_LIBS)
smartsim_CFLAGS= $(GLIB_CFLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(LIBRSVG_CFLAGS) $(LIBXML_CFLAGS) $(DEF_CFLAGS)
View
@@ -91,9 +91,12 @@ am_smartsim_OBJECTS = smartsim-annotation.$(OBJEXT) \
smartsim-propertyitem-selection.$(OBJEXT) \
smartsim-propertyitem-string.$(OBJEXT)
smartsim_OBJECTS = $(am_smartsim_OBJECTS)
-smartsim_LDADD = $(LDADD)
-smartsim_LINK = $(CCLD) $(smartsim_CFLAGS) $(CFLAGS) \
- $(smartsim_LDFLAGS) $(LDFLAGS) -o $@
+am__DEPENDENCIES_1 =
+smartsim_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
+smartsim_LINK = $(CCLD) $(smartsim_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+ $(LDFLAGS) -o $@
DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -278,7 +281,7 @@ DEF_CFLAGS = \
-DPACKAGE_DATADIR=\"$(pkgdatadir)/\" \
-DPACKAGE_VERSION=\"$(VERSION)\"
-smartsim_LDFLAGS = $(GLIB_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(LIBRSVG_LIBS) $(LIBXML_LIBS)
+smartsim_LDADD = $(GLIB_LIBS) $(GTK_LIBS) $(CAIRO_LIBS) $(LIBRSVG_LIBS) $(LIBXML_LIBS)
smartsim_CFLAGS = $(GLIB_CFLAGS) $(GTK_CFLAGS) $(CAIRO_CFLAGS) $(LIBRSVG_CFLAGS) $(LIBXML_CFLAGS) $(DEF_CFLAGS)
all: all-am

0 comments on commit 127703f

Please sign in to comment.