← Back to branch summary

~ubuntu-branches/ubuntu/lucid/vlc/lucid

« back to all changes in this revision

Viewing changes to modules/services_discovery/Makefile.in

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-11-12 15:29:11 UTC
  • mfrom: (3.5.2 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091112152911-skpz5ubpg18zjedp
Tags: 1.0.3-1ubuntu1
https://launchpad.net/bugs/435524
* Merge from Debian unstable (LP: #435524), remaining changes:
  - build against xulrunner-dev instead of iceape-dev
  - build against libx264-dev and install libx264 plugin
  - add Xb-Npp header to vlc package
  - recommend vlc-plugin-pulse for vlc
  - backport patch "402_increase_pulseaudio_score.diff"

Show diffs side-by-side

added added

removed removed

Lines of Context:
modules/services_discovery/Makefile.in
139
139
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
140
140
        $(libshout_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
141
141
        $(LDFLAGS) -o $@
142
 
am__objects_7 = libupnp_cc_plugin_la-upnp_cc.lo
143
 
am_libupnp_cc_plugin_la_OBJECTS = $(am__objects_7)
 
142
am__objects_7 = libudev_plugin_la-udev.lo
 
143
am_libudev_plugin_la_OBJECTS = $(am__objects_7)
 
144
nodist_libudev_plugin_la_OBJECTS =
 
145
libudev_plugin_la_OBJECTS = $(am_libudev_plugin_la_OBJECTS) \
 
146
        $(nodist_libudev_plugin_la_OBJECTS)
 
147
libudev_plugin_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 
148
        $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 
149
        $(libudev_plugin_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
 
150
        -o $@
 
151
am__objects_8 = libupnp_cc_plugin_la-upnp_cc.lo
 
152
am_libupnp_cc_plugin_la_OBJECTS = $(am__objects_8)
144
153
nodist_libupnp_cc_plugin_la_OBJECTS =
145
154
libupnp_cc_plugin_la_OBJECTS = $(am_libupnp_cc_plugin_la_OBJECTS) \
146
155
        $(nodist_libupnp_cc_plugin_la_OBJECTS)
148
157
        $(LIBTOOLFLAGS) --mode=link $(CXXLD) \
149
158
        $(libupnp_cc_plugin_la_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
150
159
        $(LDFLAGS) -o $@
151
 
am__objects_8 = libupnp_intel_plugin_la-upnp_intel.lo
152
 
am_libupnp_intel_plugin_la_OBJECTS = $(am__objects_8)
 
160
am__objects_9 = libupnp_intel_plugin_la-upnp_intel.lo
 
161
am_libupnp_intel_plugin_la_OBJECTS = $(am__objects_9)
153
162
nodist_libupnp_intel_plugin_la_OBJECTS =
154
163
libupnp_intel_plugin_la_OBJECTS =  \
155
164
        $(am_libupnp_intel_plugin_la_OBJECTS) \
189
198
        $(libsap_plugin_la_SOURCES) $(nodist_libsap_plugin_la_SOURCES) \
190
199
        $(libshout_plugin_la_SOURCES) \
191
200
        $(nodist_libshout_plugin_la_SOURCES) \
 
201
        $(libudev_plugin_la_SOURCES) \
 
202
        $(nodist_libudev_plugin_la_SOURCES) \
192
203
        $(libupnp_cc_plugin_la_SOURCES) \
193
204
        $(nodist_libupnp_cc_plugin_la_SOURCES) \
194
205
        $(libupnp_intel_plugin_la_SOURCES) \
196
207
DIST_SOURCES = $(libbonjour_plugin_la_SOURCES) \
197
208
        $(libhal_plugin_la_SOURCES) $(libmtp_plugin_la_SOURCES) \
198
209
        $(libpodcast_plugin_la_SOURCES) $(libsap_plugin_la_SOURCES) \
199
 
        $(libshout_plugin_la_SOURCES) $(libupnp_cc_plugin_la_SOURCES) \
 
210
        $(libshout_plugin_la_SOURCES) $(libudev_plugin_la_SOURCES) \
 
211
        $(libupnp_cc_plugin_la_SOURCES) \
200
212
        $(libupnp_intel_plugin_la_SOURCES)
201
213
ETAGS = etags
202
214
CTAGS = ctags
547
559
LTLIBtremor = @LTLIBtremor@
548
560
LTLIBts = @LTLIBts@
549
561
LTLIBtwolame = @LTLIBtwolame@
 
562
LTLIBudev = @LTLIBudev@
550
563
LTLIBunzip = @LTLIBunzip@
551
564
LTLIBupnp_cc = @LTLIBupnp_cc@
552
565
LTLIBupnp_intel = @LTLIBupnp_intel@
660
673
TAGLIB_LIBS = @TAGLIB_LIBS@
661
674
TIGER_CFLAGS = @TIGER_CFLAGS@
662
675
TIGER_LIBS = @TIGER_LIBS@
 
676
UDEV_CFLAGS = @UDEV_CFLAGS@
 
677
UDEV_LIBS = @UDEV_LIBS@
663
678
UIC = @UIC@
664
679
USE_NLS = @USE_NLS@
665
680
VCDINFO_CFLAGS = @VCDINFO_CFLAGS@
759
774
vlclibdir = @vlclibdir@
760
775
basedir = services_discovery
761
776
dir = services_discovery
762
 
mods = bonjour hal mtp podcast sap shout upnp_cc upnp_intel
763
 
libvlc_LTLIBRARIES = $(LTLIBbonjour) $(LTLIBhal) $(LTLIBmtp) $(LTLIBpodcast) $(LTLIBsap) $(LTLIBshout) $(LTLIBupnp_cc) $(LTLIBupnp_intel)
764
 
EXTRA_LTLIBRARIES = libbonjour_plugin.la libhal_plugin.la libmtp_plugin.la libpodcast_plugin.la libsap_plugin.la libshout_plugin.la libupnp_cc_plugin.la libupnp_intel_plugin.la
 
777
mods = bonjour hal mtp podcast sap shout udev upnp_cc upnp_intel
 
778
libvlc_LTLIBRARIES = $(LTLIBbonjour) $(LTLIBhal) $(LTLIBmtp) $(LTLIBpodcast) $(LTLIBsap) $(LTLIBshout) $(LTLIBudev) $(LTLIBupnp_cc) $(LTLIBupnp_intel)
 
779
EXTRA_LTLIBRARIES = libbonjour_plugin.la libhal_plugin.la libmtp_plugin.la libpodcast_plugin.la libsap_plugin.la libshout_plugin.la libudev_plugin.la libupnp_cc_plugin.la libupnp_intel_plugin.la
765
780
NULL = 
766
781
SUFFIXES = 
767
782
libvlcdir = $(vlclibdir)/$(basedir)
790
805
SOURCES_bonjour = bonjour.c
791
806
SOURCES_podcast = podcast.c
792
807
SOURCES_mtp = mtp.c
 
808
SOURCES_udev = udev.c
793
809
 
794
810
# The bonjour plugin
795
811
libbonjour_plugin_la_SOURCES = $(SOURCES_bonjour)
857
873
libshout_plugin_la_LIBADD = $(AM_LIBADD)
858
874
libshout_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym
859
875
 
 
876
# The udev plugin
 
877
libudev_plugin_la_SOURCES = $(SOURCES_udev)
 
878
nodist_libudev_plugin_la_SOURCES = $(nodist_SOURCES_udev)
 
879
# Force per-target objects:
 
880
libudev_plugin_la_CFLAGS = $(AM_CFLAGS)
 
881
libudev_plugin_la_CXXFLAGS = $(AM_CXXFLAGS)
 
882
libudev_plugin_la_OBJCFLAGS = $(AM_OBJCFLAGS)
 
883
# Set LIBADD and DEPENDENCIES manually:
 
884
libudev_plugin_la_LIBADD = $(AM_LIBADD)
 
885
libudev_plugin_la_DEPENDENCIES = $(top_srcdir)/src/libvlccore.sym
 
886
 
860
887
# The upnp_cc plugin
861
888
libupnp_cc_plugin_la_SOURCES = $(SOURCES_upnp_cc)
862
889
nodist_libupnp_cc_plugin_la_SOURCES = $(nodist_SOURCES_upnp_cc)
956
983
        $(libsap_plugin_la_LINK)  $(libsap_plugin_la_OBJECTS) $(libsap_plugin_la_LIBADD) $(LIBS)
957
984
libshout_plugin.la: $(libshout_plugin_la_OBJECTS) $(libshout_plugin_la_DEPENDENCIES) 
958
985
        $(libshout_plugin_la_LINK)  $(libshout_plugin_la_OBJECTS) $(libshout_plugin_la_LIBADD) $(LIBS)
 
986
libudev_plugin.la: $(libudev_plugin_la_OBJECTS) $(libudev_plugin_la_DEPENDENCIES) 
 
987
        $(libudev_plugin_la_LINK)  $(libudev_plugin_la_OBJECTS) $(libudev_plugin_la_LIBADD) $(LIBS)
959
988
libupnp_cc_plugin.la: $(libupnp_cc_plugin_la_OBJECTS) $(libupnp_cc_plugin_la_DEPENDENCIES) 
960
989
        $(libupnp_cc_plugin_la_LINK)  $(libupnp_cc_plugin_la_OBJECTS) $(libupnp_cc_plugin_la_LIBADD) $(LIBS)
961
990
libupnp_intel_plugin.la: $(libupnp_intel_plugin_la_OBJECTS) $(libupnp_intel_plugin_la_DEPENDENCIES) 
973
1002
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpodcast_plugin_la-podcast.Plo@am__quote@
974
1003
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libsap_plugin_la-sap.Plo@am__quote@
975
1004
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libshout_plugin_la-shout.Plo@am__quote@
 
1005
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libudev_plugin_la-udev.Plo@am__quote@
976
1006
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libupnp_cc_plugin_la-upnp_cc.Plo@am__quote@
977
1007
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libupnp_intel_plugin_la-upnp_intel.Plo@am__quote@
978
1008
 
1039
1069
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
1040
1070
@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libshout_plugin_la_CFLAGS) $(CFLAGS) -c -o libshout_plugin_la-shout.lo `test -f 'shout.c' || echo '$(srcdir)/'`shout.c
1041
1071
 
 
1072
libudev_plugin_la-udev.lo: udev.c
 
1073
@am__fastdepCC_TRUE@    $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libudev_plugin_la_CFLAGS) $(CFLAGS) -MT libudev_plugin_la-udev.lo -MD -MP -MF $(DEPDIR)/libudev_plugin_la-udev.Tpo -c -o libudev_plugin_la-udev.lo `test -f 'udev.c' || echo '$(srcdir)/'`udev.c
 
1074
@am__fastdepCC_TRUE@    $(am__mv) $(DEPDIR)/libudev_plugin_la-udev.Tpo $(DEPDIR)/libudev_plugin_la-udev.Plo
 
1075
@AMDEP_TRUE@@am__fastdepCC_FALSE@       source='udev.c' object='libudev_plugin_la-udev.lo' libtool=yes @AMDEPBACKSLASH@
 
1076
@AMDEP_TRUE@@am__fastdepCC_FALSE@       DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 
1077
@am__fastdepCC_FALSE@   $(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libudev_plugin_la_CFLAGS) $(CFLAGS) -c -o libudev_plugin_la-udev.lo `test -f 'udev.c' || echo '$(srcdir)/'`udev.c
 
1078
 
1042
1079
.cpp.o:
1043
1080
@am__fastdepCXX_TRUE@   $(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
1044
1081
@am__fastdepCXX_TRUE@   $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po