← Back to branch summary

~ubuntu-branches/ubuntu/natty/rss-glx/natty

« back to all changes in this revision

Viewing changes to oglc_src/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2009-05-01 05:30:24 UTC
  • mfrom: (1.1.4 upstream) (2.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20090501053024-32cc712ol1bd9e9j
Tags: 0.8.3-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop dependency on openal. It is not enabled by default anyway, and
    allows openal to migrate to universe.
  - reallyslick/cpp_src/skyrocket.{cpp,xml}: Disable sound by default.
  - other_src/Makefile.am: fix the upstream build rules to actually use
    the ImageMagick CFLAGS returned by pkg-config.
  - Add --disable-sound configure flag to debian/rules, as we don't keep 
    the dependencies on openal nor freeglut (both universe packages).
  - Call ./autogen.sh and build-depend on automake/autoconf, since we're
    modifying other_src/Makefile.am above.
* Dropped changes, superseded in Debian package:
  - debian/control: build-depend on libmagickwand-dev instead of
    libmagick9-dev.
* Instead of hard-coding a define of PKG_CONFIG, move the unconditional
  ImageMagick check up in configure.in so that our first PKG_CHECK_MODULES()
  call isn't hidden behind a shell conditional.

Show diffs side-by-side

added added

removed removed

Lines of Context:
oglc_src/Makefile.in
44
44
am__aclocal_m4_deps = $(top_srcdir)/configure.in
45
45
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
46
46
        $(ACLOCAL_M4)
47
 
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 
47
mkinstalldirs = $(install_sh) -d
48
48
CONFIG_HEADER = $(top_builddir)/config.h
49
49
CONFIG_CLEAN_FILES =
50
50
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
131
131
DEFS = @DEFS@
132
132
DEPDIR = @DEPDIR@
133
133
DSYMUTIL = @DSYMUTIL@
134
 
DUMPBIN = @DUMPBIN@
 
134
ECHO = @ECHO@
135
135
ECHO_C = @ECHO_C@
136
136
ECHO_N = @ECHO_N@
137
137
ECHO_T = @ECHO_T@
138
138
EGREP = @EGREP@
139
139
EXEEXT = @EXEEXT@
140
 
FGREP = @FGREP@
 
140
F77 = @F77@
 
141
FFLAGS = @FFLAGS@
141
142
GLEW = @GLEW@
142
143
GREP = @GREP@
143
144
INSTALL = @INSTALL@
145
146
INSTALL_PROGRAM = @INSTALL_PROGRAM@
146
147
INSTALL_SCRIPT = @INSTALL_SCRIPT@
147
148
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
148
 
LD = @LD@
149
149
LDFLAGS = @LDFLAGS@
150
150
LIBOBJS = @LIBOBJS@
151
151
LIBS = @LIBS@
152
152
LIBTOOL = @LIBTOOL@
153
 
LIPO = @LIPO@
154
153
LN_S = @LN_S@
155
154
LTLIBOBJS = @LTLIBOBJS@
156
155
MAKEINFO = @MAKEINFO@
157
156
MKDIR_P = @MKDIR_P@
158
 
NM = @NM@
159
157
NMEDIT = @NMEDIT@
160
158
OBJEXT = @OBJEXT@
161
 
OTOOL = @OTOOL@
162
 
OTOOL64 = @OTOOL64@
163
159
PACKAGE = @PACKAGE@
164
160
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
165
161
PACKAGE_NAME = @PACKAGE_NAME@
188
184
abs_top_srcdir = @abs_top_srcdir@
189
185
ac_ct_CC = @ac_ct_CC@
190
186
ac_ct_CXX = @ac_ct_CXX@
191
 
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
 
187
ac_ct_F77 = @ac_ct_F77@
192
188
am__include = @am__include@
193
189
am__leading_dot = @am__leading_dot@
194
190
am__quote = @am__quote@
223
219
libexecdir = @libexecdir@
224
220
localedir = @localedir@
225
221
localstatedir = @localstatedir@
226
 
lt_ECHO = @lt_ECHO@
227
222
mandir = @mandir@
228
223
mkdir_p = @mkdir_p@
229
224
oldincludedir = @oldincludedir@