← Back to branch summary

~ubuntu-branches/ubuntu/precise/rss-glx/precise

« back to all changes in this revision

Viewing changes to src/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Fabrice Coutadeur
  • Date: 2011-06-05 18:30:36 UTC
  • mfrom: (2.2.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110605183036-8ht6gky7rzf0rw2b
Tags: 0.9.1-5ubuntu1
* Merge from Debian unstable. Remaining changes:
  - Added an apport package hook
  - Changed libgl1-mesa-swx11-dev to libgl1-mesa-dev in Build-Depends

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Makefile.am
38
38
matrixview_LDADD = @BZIP2@ @PTHREAD_LIBS@ @Wand_LIBS@
39
39
plasma_SOURCES = driver.c plasma.cpp rsDefines.h rsRand.h
40
40
pixelcity_SOURCES = driver.c
41
 
pixelcity_LDADD = @quesoglc_LIBS@ -LPixelCity -lPixelCity
 
41
pixelcity_LDADD = -LPixelCity -lPixelCity @quesoglc_LIBS@
 
42
# Dummy file, not built.  Forces g++ linking
 
43
nodist_EXTRA_pixelcity_SOURCES = dummy.cpp
42
44
skyrocket_SOURCES = driver.c skyrocket.cpp skyrocket_flare.cpp skyrocket_particle.cpp skyrocket_shockwave.cpp skyrocket_smoke.cpp skyrocket_sound.cpp skyrocket_world.cpp skyrocket_textures.cpp rsDefines.h rsRand.h
43
45
solarwinds_SOURCES = driver.c solarwinds.cpp rsDefines.h rsRand.h
44
46
spirographx_SOURCES = driver.c spirographx.c