← Back to branch summary

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

« back to all changes in this revision

Viewing changes to xrdb/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:
xrdb/Makefile.am
21
21
 
22
22
bin_PROGRAMS = xrdb
23
23
 
24
 
AM_CFLAGS = $(XRDB_CFLAGS)
 
24
AM_CFLAGS = $(CWARNFLAGS) $(XRDB_CFLAGS)
25
25
xrdb_LDADD = $(XRDB_LIBS)
26
26
 
27
27
xrdb_SOURCES =  \
34
34
 
35
35
appman_DATA = $(appman_PRE:man=@APP_MAN_SUFFIX@)
36
36
 
37
 
EXTRA_DIST = $(appman_PRE) ChangeLog autogen.sh
 
37
EXTRA_DIST = $(appman_PRE) ChangeLog
38
38
CLEANFILES = $(appman_DATA)
39
39
MAINTAINERCLEANFILES=ChangeLog
40
40
 
41
41
.PHONY: ChangeLog
42
42
 
43
43
ChangeLog:
44
 
        (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)
 
44
        $(CHANGELOG_CMD)
45
45
 
46
46
dist-hook: ChangeLog
47
47
 
67
67
SUFFIXES = .$(APP_MAN_SUFFIX) .man
68
68
 
69
69
.man.$(APP_MAN_SUFFIX):
70
 
        sed $(MAN_SUBSTS) < $< > $@
 
70
        $(AM_V_GEN)$(SED) $(MAN_SUBSTS) < $< > $@