Changeset 623Tweet

Timestamp:

Feb 9, 2011, 3:20:07 PM (12 years ago)

Author:

sam

Message:

Stop using pkg-config in Makefiles and stop putting things in LDADD that
require to appear before LDFLAGS in the linker call.

Location:

trunk

Files:

• configure.ac (modified) (6 diffs)
• deushax/Makefile.am (modified) (1 diff)
• monsterz/Makefile.am (modified) (1 diff)
• src/Makefile.am (modified) (1 diff)

trunk/configure.ac

@@ -23 +23 @@
 AC_C_INLINE
 
+dnl Ensure an error is thrown if pkg-config M4 files are not found.
+m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
+m4_pattern_forbid([^PKG_CHECK_MODULES$])
+m4_pattern_forbid([^PKG_PROG_PKG_CONFIG$])
+
+dnl Do not use PKG_CONFIG_LIBDIR when cross-compiling.
+if test "${build}" != "${host}" -a "${PKG_CONFIG_LIBDIR}" = ""; then
+  export PKG_CONFIG_LIBDIR=/dev/null
+fi
+
 dnl AC_PROG_EGREP only exists in autoconf 2.54+, so we use AC_EGREP_CPP right
 dnl now otherwise it might be set in an obscure if statement. Same thing for
@@ -28 +38 @@
 AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
-m4_pattern_allow([^PKG_CONFIG_LIBDIR$])
-if test "${build}" != "${host}" -a "${PKG_CONFIG_LIBDIR}" = ""; then
-  export PKG_CONFIG_LIBDIR=/dev/null
-fi
 
 dnl conditional builds
@@ -74 +80 @@
 
 
-# Use libcaca? (required for font generation)
+dnl Use libcaca? (required for font generation)
 ac_cv_my_have_caca="no"
 PKG_CHECK_MODULES(CACA, caca >= 0.99.beta17, [ac_cv_my_have_caca="yes"], [:])
@@ -83 +89 @@
 
 
-# Use libpipi? (required for video recording)
+dnl Use libpipi? (required for video recording)
 ac_cv_my_have_pipi="no"
 PKG_CHECK_MODULES(PIPI, pipi, [ac_cv_my_have_pipi="yes"], [:])
@@ -92 +98 @@
 
 
+dnl Use GTK+? (required for the deushax editor)
+GTK_CFLAGS="$GTK_CFLAGS `pkg-config --cflags gtk+-2.0 gtkgl-2.0`"
+GTK_LIBS="$GTK_LIBS `pkg-config --libs gtk+-2.0 gtkgl-2.0`"
+
 # How to use the Lol Engine inside this tree
-LOL_CFLAGS="-I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`"
-LOL_LIBS="`pkg-config --libs sdl gl SDL_image` -lSDL_mixer"
+LOL_CFLAGS="$LOL_CFLAGS -I \$(top_srcdir)/src `pkg-config --cflags sdl gl SDL_image`"
+LOL_LIBS="$LOL_LIBS `pkg-config --libs sdl gl SDL_image` -lSDL_mixer"
 
 if test "${enable_release}" = "yes"; then
@@ -101 +111 @@
 
 AC_SUBST(MATH_LIBS)
+AC_SUBST(GTK_CFLAGS)
+AC_SUBST(GTK_LIBS)
 AC_SUBST(LOL_CFLAGS)
 AC_SUBST(LOL_LIBS)

trunk/deushax/Makefile.am

@@ -4 +4 @@
 deushax_SOURCES = deushax.cpp game.cpp game.h debugsprite.cpp debugsprite.h
 deushax_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-deushax_LDADD = $(top_builddir)/src/liblol.a
-deushax_LDFLAGS = @LOL_LIBS@ @PIPI_LIBS@
+deushax_LDADD =
+deushax_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 
 editor_SOURCES = gtk/editor.cpp gtk/glmapview.cpp gtk/glmapview.h \
                  mapviewer.cpp mapviewer.h
-editor_CXXFLAGS = @LOL_CFLAGS@ `pkg-config --cflags gtk+-2.0 gtkgl-2.0`
-editor_LDADD = $(top_builddir)/src/liblol.a
-editor_LDFLAGS = @LOL_LIBS@ `pkg-config --libs gtk+-2.0 gtkgl-2.0`
+editor_CXXFLAGS = @GTK_CFLAGS@ @LOL_CFLAGS@
+editor_LDADD =
+editor_LDFLAGS = $(top_builddir)/src/liblol.a @GTK_LIBS@ @LOL_LIBS@
 EXTRA_DIST = gtk/editor.xml
 

trunk/monsterz/Makefile.am

@@ -6 +6 @@
     board.cpp board.h piece.cpp piece.h mash.cpp mash.h thumbs.cpp thumbs.h
 monsterz_CXXFLAGS = @LOL_CFLAGS@ @PIPI_CFLAGS@
-monsterz_LDADD = $(top_builddir)/src/liblol.a
-monsterz_LDFLAGS = @LOL_LIBS@ @PIPI_LIBS@
+monsterz_LDADD =
+monsterz_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 
 EXTRA_DIST = $(PNG) $(WAV)

trunk/src/Makefile.am

@@ -15 +15 @@
     debugfps.cpp debugfps.h debugsphere.cpp debugsphere.h \
     debugrecord.cpp debugrecord.h debugstats.cpp debugstats.h
-liblol_a_CXXFLAGS = `pkg-config --cflags sdl gl SDL_image`
+liblol_a_CXXFLAGS = @LOL_CFLAGS@