← Back to branch summary

~ubuntu-branches/ubuntu/precise/uim/precise

« back to all changes in this revision

Viewing changes to qt4/toolbar/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Ilya Barygin
  • Date: 2011-12-18 16:35:38 UTC
  • mfrom: (1.1.13) (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111218163538-8ktir39z2mjpii8z
Tags: 1:1.7.1-3ubuntu1
https://launchpad.net/bugs/818199
* Merge from Debian testing (LP: #818199).
* Remaining changes:
  - debian/uim-qt.install: Fix plugin path for multiarch location.
* Dropped changes:
  - uim-applet-gnome removal (GNOME 3 applet is available)
  - 19_as-needed_compile_fix.dpatch (accepted into Debian package)
* translations.patch: add several files to POTFILE.in to prevent
  intltool-update failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
qt4/toolbar/Makefile.am
7
7
if APPLET_KDE4
8
8
        ( cd build; $(MAKE) $(AM_MAKEFLAGS) $@ )
9
9
endif
 
10
endif
10
11
 
11
12
# *.pro is required to run Makefile.qmake. So distclean-am is deferred.
12
13
distclean:
 
14
if QT4
13
15
        $(MAKE) $(AM_MAKEFLAGS) -f Makefile.qmake $@
14
16
        $(MAKE) $(AM_MAKEFLAGS) distclean-am
15
 
        -rm -f Makefile uim-toolbar-qt4.pro
16
 
        -rm -rf build/*
17
 
else
18
 
distclean:
19
 
        -rm -f Makefile uim-toolbar-qt4.pro
20
 
        -rm -rf build/*
21
17
endif
 
18
        -rm -f Makefile uim-toolbar-qt4.pro plasma-applet-uim.desktop
 
19
        -rm -rf build/*
22
20
 
23
21
FORCE:
24
22