← Back to branch summary

~ubuntu-branches/ubuntu/raring/gimp/raring

« back to all changes in this revision

Viewing changes to plug-ins/imagemap/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-02-22 23:47:53 UTC
  • mfrom: (1.1.25) (0.4.15 sid)
  • Revision ID: package-import@ubuntu.com-20120222234753-2a4wqdkb2bbx4mjb
Tags: 2.6.12-1ubuntu1
https://launchpad.net/bugs/925674
https://launchpad.net/bugs/680521
* Merge from Debian unstable (LP: #925674). Remaining Changes:
  - debian/patches/02_help-message.patch,
    debian/patches/03_gimp.desktop.in.in.patch:
    + Update some strings for Ubuntu
  - debian/patches/ghost-cursor.patch: fix Wacom tablet cursor events
  - debian/control:
    + Update description
  - debian/rules:
    + Set gettext domain and update translation templates

* Drop poppler patch as it's been applied upstream
  - drop debian/patches/poppler0.18.patch
  - update debian/patches/series
* fix LP: #680521 - Embed page setup dialog functionality in the print dialog
  - add debian/patches/embed-page-setup-dialog.patch
  - update debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
plug-ins/imagemap/Makefile.am
1
1
## Process this file with automake to produce Makefile.in
2
2
 
 
3
if OS_WIN32
 
4
mwindows = -mwindows
 
5
else
 
6
libm = -lm
 
7
endif
 
8
 
3
9
libgimpui = $(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
4
10
libgimpconfig = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
5
11
libgimpwidgets = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
6
12
libgimp = $(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
7
13
libgimpcolor = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
8
14
libgimpbase = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
9
 
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
10
 
 
11
 
if OS_WIN32
12
 
mwindows = -mwindows
13
 
endif
 
15
libgimpmath = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la $(libm)
14
16
 
15
17
AM_LDFLAGS = $(mwindows)
16
18