← Back to branch summary

~ubuntu-branches/ubuntu/precise/xdm/precise

« back to all changes in this revision

Viewing changes to cpprules.in

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-30 00:53:09 UTC
  • mfrom: (9.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110130005309-30mjjyk7div7d494
Tags: 1:1.1.10-3ubuntu1
https://launchpad.net/bugs/682196
http://bugs.debian.org/556694
* Merge from debian unstable.  Remaining changes: (LP: #682196)
  - debian/{rules, xdm.install, local/ubuntu*}:
    + Add Ubuntu graphics and configure xdm to use them by default.
  - debian/patches/ubuntu_no_whiteglass.diff: Don't hardcode
    the default Xcursor theme to whiteglass. Use the Ubuntu
    default x-cursor-theme instead.
* debian/patches/ftbfs_binutils-gold.diff: Fix FTBFS with binutils-gold
  and ld --as-needed. (Closes: #556694)
* Dropped changes, no longer applicable:
  - debian/{xdm.postinst.in, xdm.postrm.in, xdm.preinst.in}

Show diffs side-by-side

added added

removed removed

Lines of Context:
cpprules.in
22
22
                       -e '/^[         ]*XHASH/s/XHASH/\#/' \
23
23
                       -e '/\@\@$$/s/\@\@$$/\\/'
24
24
 
 
25
if HAVE_AM_SILENT_RULES
 
26
# Support for automake 1.11 AM_SILENT_RULES
 
27
cpp_verbose = $(cpp_verbose_$(V))
 
28
cpp_verbose_ = $(cpp_verbose_$(AM_DEFAULT_VERBOSITY))
 
29
cpp_verbose_0 = @echo "  CPP   " $@;
 
30
endif HAVE_AM_SILENT_RULES
 
31
 
25
32
.cpp:
26
 
        $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@
 
33
        $(cpp_verbose)$(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@