← Back to branch summary

~ubuntu-branches/ubuntu/wily/gargoyle-free/wily-proposed

« back to all changes in this revision

Viewing changes to Jamrules

  • Committer: Package Import Robot
  • Author(s): Sylvain Beucler
  • Date: 2012-05-24 22:57:48 UTC
  • Revision ID: package-import@ubuntu.com-20120524225748-vlon532s7702dqgx
Tags: 2011.1-2
http://bugs.debian.org/674336
* Fix FTBFS: sdl-sound1.2-1.0.3-6 stripped its depencies, and the
  gargoyle build system made unnecessary references to -lsmpeg and
  -lvorbis that are normally used when building with the bundled copy of
  sdl-sound. (Closes: #674336)
* Fix FTBFS: -lrt was missing. This has never been a problem so I
  suspect we previously got it indirectly through pkg-config --libs.
* Bump Standards-Version to 3.9.3
* Minimize ignore_bundled_libraries.patch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Jamrules
88
88
            PKGCONFIG = "pkg-config freetype2 gtk+-x11-2.0 gdk-x11-2.0 gobject-2.0 glib-2.0 fontconfig" ;
89
89
        }
90
90
        GARGLKCCFLAGS = "`$(PKGCONFIG) --cflags`" -fPIC ;
91
 
        GARGLKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz ;
 
91
        GARGLKLIBS = "`$(PKGCONFIG) --libs`" -ljpeg -lpng -lz -lrt ;
92
92
        LINKLIBS = -lz -lm "`$(PKGCONFIG) --libs`" ;
93
93
 
94
94
        if $(USESDL) = yes
95
95
        {
96
96
            GARGLKCCFLAGS += -I/usr/include/SDL ;
97
 
            GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL -lsmpeg -lvorbisfile ;
 
97
            GARGLKLIBS += -lSDL_mixer -lSDL_sound -lSDL ;
98
98
        }
99
99
 
100
100
        if $(STATIC) { LINKLIBS += $(GARGLKLIBS) ; }