~ubuntu-branches/ubuntu/vivid/blueman/vivid-proposed

« back to all changes in this revision

Viewing changes to sendto/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Artur Rona
  • Date: 2014-12-24 18:33:36 UTC
  • mfrom: (2.3.8 sid)
  • Revision ID: package-import@ubuntu.com-20141224183336-cyb82ot0y8tz8flq
Tags: 1.99~alpha1-1ubuntu1
* Merge from Debian unstable.  Remaining changes:
  - debian/patches/01_dont_autostart_lxde.patch:
    + Don't autostart the applet in LXDE.
  - debian/patches/03_filemanager_fix.patch:
    + Add support for more filemanagers.
* debian/patches/02_dont_crash_on_non-bluetooth_card.patch:
  - Dropped, no longer applicable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
8
8
 
9
9
libnstblueman_la_SOURCES = nautilus-bluetooth-sendto.c
10
10
libnstblueman_la_LDFLAGS = -module -avoid-version
11
 
libnstblueman_la_LIBADD = $(BLUEZ_LIBS) @PYTHON_LIBS@
12
 
libnstblueman_la_CFLAGS = @PYTHON_INCLUDES@ $(BLUEZ_CFLAGS)
 
11
libnstblueman_la_LIBADD = $(BLUEZ_LIBS) $(PYGOBJECT_LIBS) $(PYTHON_LIBS)
 
12
libnstblueman_la_CFLAGS = $(PYTHON_CFLAGS) $(BLUEZ_CFLAGS) $(PYGOBJECT_CFLAGS)
13
13
 
14
14
endif
15
15