← Back to branch summary

~ubuntu-branches/ubuntu/trusty/pango1.0/trusty

« back to all changes in this revision

Viewing changes to build/win32/vs9/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Iain Lane
  • Date: 2014-03-05 10:08:08 UTC
  • mfrom: (1.6.9) (63.4.2 sid)
  • Revision ID: package-import@ubuntu.com-20140305100808-rtu74f543zsiq6bu
Tags: 1.36.2-2ubuntu1
* Resynchronise on Debian, remaining change:
  - Add a versioned conflicts on old versions of plymouth whose initramfs
    hook tries to find pango modules. The Debian version of this change
    uses Breaks which is insufficient, and doesn't match the version of
    the plymouth package that supports the new path in Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
build/win32/vs9/Makefile.am
1
1
EXTRA_DIST =    \
2
2
        pango.sln       \
3
 
        pango_fc.sln    \
4
 
        pango.vspropsin \
5
 
        pango.vsprops   \
 
3
        pango-build-defines.vsprops     \
 
4
        pango-ignore-fc.vsprops \
 
5
        pango-install-bin.vsprops       \
 
6
        pango-install.vsprops   \
 
7
        pango-install.vspropsin \
 
8
        pango-prebuild.vsprops  \
 
9
        pango-version-paths.vsprops     \
6
10
        pango.vcprojin  \
7
11
        pango.vcproj    \
8
12
        pangoft2.vcprojin       \
12
16
        pangowin32.vcproj       \
13
17
        install.vcproj  \
14
18
        stdint.h        \
15
 
        gengir.vcproj   \
16
19
        README.txt
17
20
 
18
 
pango.vsprops: $(top_srcdir)/build/win32/vs9/pango.vspropsin pango.vs9.headers
19
 
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango.vspropsin >$@
 
21
pango-install.vsprops: $(top_srcdir)/build/win32/vs9/pango-install.vspropsin pango.vs9.headers
 
22
        $(CPP) -P - <$(top_srcdir)/build/win32/vs9/pango-install.vspropsin >$@
20
23
        rm pango.vs9.headers
21
24
 
22
 
DISTCLEANFILES = pango.vsprops
 
25
DISTCLEANFILES = pango-install.vsprops
23
26
 
24
27
-include $(top_srcdir)/git.mk