← Back to branch summary

~ubuntu-branches/ubuntu/quantal/x11-xserver-utils/quantal

« back to all changes in this revision

Viewing changes to xmodmap/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2010-01-08 18:38:47 UTC
  • mfrom: (5.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100108183847-wuunshkmhcyh7vzc
Tags: 7.5+1ubuntu1
* Merge from Debian.  Remaining Ubuntu changes:
  - Add 100_xrandr-output.patch: When using --scale or --transform, verify
    a valid output parameter is used; crashes otherwise.

Show diffs side-by-side

added added

removed removed

Lines of Context:
xmodmap/Makefile.am
21
21
 
22
22
bin_PROGRAMS = xmodmap
23
23
 
24
 
AM_CFLAGS = $(DEP_CFLAGS)
25
 
xmodmap_LDADD = $(DEP_LIBS)
 
24
AM_CFLAGS = $(CWARNFLAGS) $(XMODMAP_CFLAGS)
 
25
xmodmap_LDADD = $(XMODMAP_LIBS)
26
26
 
27
27
xmodmap_SOURCES =       \
28
28
        exec.c \
53
53
XORGRELSTRING = @PACKAGE_STRING@
54
54
  XORGMANNAME = X Version 11
55
55
 
 
56
X11_DATADIR=$(datadir)/X11      # Where libX11 installs XKeysymDB
 
57
 
56
58
MAN_SUBSTS = \
57
59
        -e 's|__vendorversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
58
60
        -e 's|__xorgversion__|"$(XORGRELSTRING)" "$(XORGMANNAME)"|' \
60
62
        -e 's|__xconfigfile__|xorg.conf|g' \
61
63
        -e 's|__projectroot__|$(prefix)|g' \
62
64
        -e 's|__apploaddir__|$(appdefaultdir)|' \
 
65
        -e 's|__X11datadir__|$(X11_DATADIR)|' \
63
66
        -e 's|__appmansuffix__|$(APP_MAN_SUFFIX)|g' \
64
67
        -e 's|__libmansuffix__|$(LIB_MAN_SUFFIX)|g' \
65
68
        -e 's|__adminmansuffix__|$(ADMIN_MAN_SUFFIX)|g' \
69
72
SUFFIXES = .$(APP_MAN_SUFFIX) .man
70
73
 
71
74
.man.$(APP_MAN_SUFFIX):
72
 
        sed $(MAN_SUBSTS) < $< > $@
 
75
        $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@
73
76
 
74
77
MAINTAINERCLEANFILES = ChangeLog
75
78
 
76
79
.PHONY: ChangeLog
77
80
 
78
81
ChangeLog:
79
 
        (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
 
82
        $(CHANGELOG_CMD)
80
83
 
81
84
dist-hook: ChangeLog
82
85