From 1865a99ae8ef8207a7846ce494b3c3689018e226 Mon Sep 17 00:00:00 2001 From: tanya Date: Wed, 28 Jul 2010 16:50:36 +0300 Subject: [PATCH] fixed data/Makefile.am after merge --- applet/data/Makefile.am | 7 +----- applet/data/Makefile.in | 56 ++++++++++++++++++++++++++++++++++++----------- 2 files changed, 44 insertions(+), 19 deletions(-) diff --git a/applet/data/Makefile.am b/applet/data/Makefile.am index 89c19c6..e7a2f70 100644 --- a/applet/data/Makefile.am +++ b/applet/data/Makefile.am @@ -28,13 +28,11 @@ moderntheme_DATA = theme/Modern/* matrixthemedir = $(datadir)/livewp/theme/Matrix matrixtheme_DATA = theme/Matrix/* -<<<<<<< HEAD accelthemedir = $(datadir)/livewp/theme/Accel acceltheme_DATA = theme/Accel/* -======= + videothemedir = $(datadir)/livewp/theme/Video videotheme_DATA = theme/Video/* ->>>>>>> master dbus_servicedir = $(datadir)/dbus-1/services dbus_service_DATA = org.maemo.livewp.service @@ -67,11 +65,8 @@ uninstall-local: EXTRA_DIST = $(berlintheme_DATA) \ $(moderntheme_DATA) \ $(matrixtheme_DATA) \ -<<<<<<< HEAD $(acceltheme_DATA) \ -======= $(videotheme_DATA) \ ->>>>>>> master $(dbus_service_DATA) diff --git a/applet/data/Makefile.in b/applet/data/Makefile.in index 1aa5e3a..ac07958 100644 --- a/applet/data/Makefile.in +++ b/applet/data/Makefile.in @@ -67,15 +67,17 @@ CONFIG_HEADER = $(top_builddir)/src/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" +am__installdirs = "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)" accelthemeDATA_INSTALL = $(INSTALL_DATA) berlinthemeDATA_INSTALL = $(INSTALL_DATA) dbus_serviceDATA_INSTALL = $(INSTALL_DATA) desktoppanelDATA_INSTALL = $(INSTALL_DATA) matrixthemeDATA_INSTALL = $(INSTALL_DATA) modernthemeDATA_INSTALL = $(INSTALL_DATA) +videothemeDATA_INSTALL = $(INSTALL_DATA) DATA = $(acceltheme_DATA) $(berlintheme_DATA) $(dbus_service_DATA) \ - $(desktoppanel_DATA) $(matrixtheme_DATA) $(moderntheme_DATA) + $(desktoppanel_DATA) $(matrixtheme_DATA) $(moderntheme_DATA) \ + $(videotheme_DATA) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -241,6 +243,9 @@ matrixthemedir = $(datadir)/livewp/theme/Matrix matrixtheme_DATA = theme/Matrix/* accelthemedir = $(datadir)/livewp/theme/Accel acceltheme_DATA = theme/Accel/* + = ====== +videothemedir = $(datadir)/livewp/theme/Video +videotheme_DATA = theme/Video/* dbus_servicedir = $(datadir)/dbus-1/services dbus_service_DATA = org.maemo.livewp.service desktoppaneldir = $(datadir)/applications/hildon-control-panel @@ -252,8 +257,7 @@ icondir = $(datadir)/icons/hicolor EXTRA_DIST = $(berlintheme_DATA) \ $(moderntheme_DATA) \ $(matrixtheme_DATA) \ - $(acceltheme_DATA) \ - $(dbus_service_DATA) +<<<<<<< HEAD all: all-am @@ -399,6 +403,23 @@ uninstall-modernthemeDATA: echo " rm -f '$(DESTDIR)$(modernthemedir)/$$f'"; \ rm -f "$(DESTDIR)$(modernthemedir)/$$f"; \ done +install-videothemeDATA: $(videotheme_DATA) + @$(NORMAL_INSTALL) + test -z "$(videothemedir)" || $(mkdir_p) "$(DESTDIR)$(videothemedir)" + @list='$(videotheme_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " $(videothemeDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(videothemedir)/$$f'"; \ + $(videothemeDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(videothemedir)/$$f"; \ + done + +uninstall-videothemeDATA: + @$(NORMAL_UNINSTALL) + @list='$(videotheme_DATA)'; for p in $$list; do \ + f="`echo $$p | sed -e 's|^.*/||'`"; \ + echo " rm -f '$(DESTDIR)$(videothemedir)/$$f'"; \ + rm -f "$(DESTDIR)$(videothemedir)/$$f"; \ + done tags: TAGS TAGS: @@ -407,7 +428,7 @@ CTAGS: distdir: $(DISTFILES) - $(mkdir_p) $(distdir)/theme/Accel $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern + $(mkdir_p) $(distdir)/theme/Berlin $(distdir)/theme/Matrix $(distdir)/theme/Modern @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -438,7 +459,7 @@ check-am: all-am check: check-am all-am: Makefile $(DATA) installdirs: - for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)"; do \ + for dir in "$(DESTDIR)$(accelthemedir)" "$(DESTDIR)$(berlinthemedir)" "$(DESTDIR)$(dbus_servicedir)" "$(DESTDIR)$(desktoppaneldir)" "$(DESTDIR)$(matrixthemedir)" "$(DESTDIR)$(modernthemedir)" "$(DESTDIR)$(videothemedir)"; do \ test -z "$$dir" || $(mkdir_p) "$$dir"; \ done install: install-am @@ -486,7 +507,7 @@ info-am: install-data-am: install-accelthemeDATA install-berlinthemeDATA \ install-data-local install-dbus_serviceDATA \ install-desktoppanelDATA install-matrixthemeDATA \ - install-modernthemeDATA + install-modernthemeDATA install-videothemeDATA install-exec-am: @@ -515,7 +536,7 @@ ps-am: uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \ uninstall-dbus_serviceDATA uninstall-desktoppanelDATA \ uninstall-info-am uninstall-local uninstall-matrixthemeDATA \ - uninstall-modernthemeDATA + uninstall-modernthemeDATA uninstall-videothemeDATA .PHONY: all all-am check check-am clean clean-generic clean-libtool \ distclean distclean-generic distclean-libtool distdir dvi \ @@ -525,15 +546,19 @@ uninstall-am: uninstall-accelthemeDATA uninstall-berlinthemeDATA \ install-dbus_serviceDATA install-desktoppanelDATA install-exec \ install-exec-am install-info install-info-am install-man \ install-matrixthemeDATA install-modernthemeDATA install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall \ - uninstall-accelthemeDATA uninstall-am \ + install-videothemeDATA installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ + ps ps-am uninstall uninstall-accelthemeDATA uninstall-am \ uninstall-berlinthemeDATA uninstall-dbus_serviceDATA \ uninstall-desktoppanelDATA uninstall-info-am uninstall-local \ - uninstall-matrixthemeDATA uninstall-modernthemeDATA + uninstall-matrixthemeDATA uninstall-modernthemeDATA \ + uninstall-videothemeDATA +<<<<<<< HEAD +>>>>>>> master + install-data-local: i=livewp; \ $(mkinstalldirs) $(DESTDIR)$(icondir)/26x26/hildon; \ @@ -548,6 +573,11 @@ uninstall-local: rm $(DESTDIR)$(icondir)/26x26/hildon/$$i.png; \ rm $(DESTDIR)$(icondir)/40x40/hildon/$$i.png; \ $(DESTDIR)$(icondir)/scalable/hildon/$$i.png; + $(acceltheme_DATA) \ +======= + $(videotheme_DATA) \ +>>>>>>> master + $(dbus_service_DATA) livewp.desktop: livewp.desktop.in sed "s/__VERSION__/$(VERSION)/g" $< >$@.tmp && \ -- 1.7.9.5