← Back to branch summary

~noskcaj/ubuntu/trusty/xfdesktop4/git-patches

« back to all changes in this revision

Viewing changes to settings/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Jackson Doak
  • Date: 2014-03-19 16:33:54 UTC
  • mfrom: (3.1.14 experimental)
  • Revision ID: package-import@ubuntu.com-20140319163354-9jismnm7xh1jrskz
Tags: 4.11.4-1ubuntu1
* Merge from debian. Remaining changes:
  - debian/patches/xubuntu_improve-nautilus-interactions.patch: added,
    should prevent nautilus from taking over the desktop if xfdesktop is
    running (and vice-versa).
  - debian/patches/xubuntu_set-accountsservice-user-bg.patch: update the
    user background property of Accountsservice on backdrop change.

Show diffs side-by-side

added added

removed removed

Lines of Context:
settings/Makefile.in
86
86
 
87
87
subdir = settings
88
88
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 
89
        $(srcdir)/xfce-backdrop-settings.desktop.in.in \
89
90
        $(top_srcdir)/depcomp
90
91
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
91
92
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
93
94
        $(ACLOCAL_M4)
94
95
mkinstalldirs = $(install_sh) -d
95
96
CONFIG_HEADER = $(top_builddir)/config.h
96
 
CONFIG_CLEAN_FILES =
 
97
CONFIG_CLEAN_FILES = xfce-backdrop-settings.desktop.in
97
98
CONFIG_CLEAN_VPATH_FILES =
98
99
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(desktopdir)"
99
100
PROGRAMS = $(bin_PROGRAMS)
364
365
XFCONF_LIBS = @XFCONF_LIBS@
365
366
XFCONF_REQUIRED_VERSION = @XFCONF_REQUIRED_VERSION@
366
367
XFCONF_VERSION = @XFCONF_VERSION@
 
368
XFDESKTOP_VERSION_SHORT = @XFDESKTOP_VERSION_SHORT@
367
369
XGETTEXT = @XGETTEXT@
368
370
XGETTEXT_ARGS = @XGETTEXT_ARGS@
369
371
XMKMF = @XMKMF@
502
504
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
503
505
        cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
504
506
$(am__aclocal_m4_deps):
 
507
xfce-backdrop-settings.desktop.in: $(top_builddir)/config.status $(srcdir)/xfce-backdrop-settings.desktop.in.in
 
508
        cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
505
509
install-binPROGRAMS: $(bin_PROGRAMS)
506
510
        @$(NORMAL_INSTALL)
507
511
        @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \