← Back to branch summary

~ubuntu-branches/ubuntu/raring/banshee/raring

« back to all changes in this revision

Viewing changes to src/Libraries/Mtp/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2012-01-23 23:16:49 UTC
  • mfrom: (6.3.22 experimental)
  • Revision ID: package-import@ubuntu.com-20120123231649-safm1f8eycltcgsf
Tags: 2.3.4.ds-1ubuntu1
https://launchpad.net/bugs/766303
* Merge from Debian Experimental, remaining changes:
  + Enable and recommend SoundMenu and Disable NotificationArea by default
  + Disable boo and karma extensions
  + Enable and suggest u1ms
  + Move desktop file for Meego UI to /usr/share/une/applications
  + Change the url for the Amazon store redirector
  + [08dea2c] Revert "Fix invalid cast causing ftbfs with libgpod"
* [b617fe0] Convert Ubuntu-specific patches to gbp-pq patches
* Also fixes Launchpad bugs:
  - Fixes race condition while starting (LP: #766303)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Libraries/Mtp/Makefile.am
2
2
TARGET = library
3
3
LINK = $(REF_MTP)
4
4
 
5
 
if LIBMTP_EIGHT
6
 
BUILD_DEFINES = "-define:LIBMTP8"
7
 
else
8
5
BUILD_DEFINES = ""
9
 
endif
10
6
 
11
7
if LIBMTP_TRACK_STRUCT_HAS_MODDATE
12
8
BUILD_DEFINES += "-define:LIBMTP_TRACK_HAS_MODDATE"
21
17
        Mtp/Album.cs \
22
18
        Mtp/Error.cs \
23
19
        Mtp/ErrorCode.cs \
 
20
        Mtp/File.cs \
24
21
        Mtp/FileSampleData.cs \
25
22
        Mtp/FileType.cs \
26
23
        Mtp/Folder.cs \
31
28
if ENABLE_MTP
32
29
include $(top_srcdir)/build/build.mk
33
30
module_SCRIPTS += Mtp.dll.config
 
31
else
 
32
include $(top_srcdir)/build/build.dist.mk
 
33
endif
 
34
 
34
35
EXTRA_DIST += Mtp.dll.config.in
35
36
DISTCLEANFILES += Mtp.dll.config
36
 
else
37
 
EXTRA_DIST = $(SOURCES) Mtp.dll.config.in
38
 
DISTCLEANFILES = Mtp.dll.config
39
 
endif
40
 
 
41