~ubuntu-branches/ubuntu/trusty/enigma/trusty-proposed

« back to all changes in this revision

Viewing changes to tools/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Erich Schubert
  • Date: 2013-04-06 14:54:02 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130406145402-jgjrtk7hac8gtvza
Tags: 1.20-dfsg.1-1
* New upstream release (Closes: #704595)
  (Repacked: dropped zipios++ source and main menu music)
* Update watch file, sf.net again.
* Fix documentation links (Closes: #653508)
* Conflict with enigma-level-previews to encourage deinstallation
  (Pregenerated level previews were only used with version 1.01)
* Use dh7 for building instead of CDBS
* Update to policy 3.9.4.0 (no changes)
* Register documentation with doc-base

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
ttf2bmf_CXXFLAGS = @SDL_CFLAGS@ $(AM_CXXFLAGS)
16
16
ttf2bmf_LDADD = -lSDL_ttf $(AM_LDADD)
17
17
 
18
 
tolua_SOURCES = tolua.c toluabind.c toluabind.h dummy.cc
 
18
tolua_SOURCES = tolua.c toluabind.c toluabind.h dummy.cc 
19
19
 
20
20
tolua_CFLAGS = -I$(top_srcdir)/lib-src/lua $(AM_CFLAGS)
21
 
tolua_LDADD = -L$(top_builddir)/lib-src/lua -llua $(AM_LDADD)
 
21
tolua_LDADD = $(top_builddir)/lib-src/lua/liblua.a $(AM_LDADD)
22
22
 
23
23
if CXXLUA
24
24
tolua_CFLAGS += -x c++ $(AM_CXXFLAGS) $(CXXFLAGS)