aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-05-27 12:31:57 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2016-05-27 12:31:57 +0900
commit43d1998c5f3f5285c96da4fd26f281ff6bb88dc7 (patch)
tree5892d4ffa39bf6912551b46205e9d207e6d3e3ff /data
parentfix subtitle auto-load for when filenames have 2 dots (or more) in file (diff)
downloadrage-43d1998c5f3f5285c96da4fd26f281ff6bb88dc7.tar.gz
Revert "improve build system to use only one makefile"
This reverts commit 25ffdc470cdd28d4c55782563b833151641a0356. go back to good 'old subdir build. it's just too much of a pain having to always build from a toplevel dir. see all the issues with efl doing this.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am3
-rw-r--r--data/desktop/Makefile.am6
-rw-r--r--data/desktop/Makefile.mk5
-rw-r--r--data/icons/Makefile.am6
-rw-r--r--data/icons/Makefile.mk5
-rw-r--r--data/themes/Makefile.am (renamed from data/themes/Makefile.mk)22
-rw-r--r--data/themes/images/Makefile.am36
-rw-r--r--data/themes/images/Makefile.mk37
8 files changed, 61 insertions, 59 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 0000000..4379365
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = desktop icons themes
+
diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am
new file mode 100644
index 0000000..bce3b5b
--- /dev/null
+++ b/data/desktop/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/applications
+files_DATA = \
+rage.desktop
+
+EXTRA_DIST = $(files_DATA)
diff --git a/data/desktop/Makefile.mk b/data/desktop/Makefile.mk
deleted file mode 100644
index 1e1d103..0000000
--- a/data/desktop/Makefile.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-desktopdir = $(datadir)/applications
-desktop_DATA = \
-data/desktop/rage.desktop
-
-EXTRA_DIST += $(desktop_DATA)
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 0000000..1f12837
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+filesdir = $(datadir)/icons
+files_DATA = \
+rage.png
+
+EXTRA_DIST = $(files_DATA)
diff --git a/data/icons/Makefile.mk b/data/icons/Makefile.mk
deleted file mode 100644
index 5a9f464..0000000
--- a/data/icons/Makefile.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-icondir = $(datadir)/icons
-icon_DATA = \
-data/icons/rage.png
-
-EXTRA_DIST += $(icon_DATA)
diff --git a/data/themes/Makefile.mk b/data/themes/Makefile.am
index 29d7606..f601a59 100644
--- a/data/themes/Makefile.mk
+++ b/data/themes/Makefile.am
@@ -1,27 +1,25 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = images
+
EDJE_CC = @edje_cc@
EDJE_FLAGS_VERBOSE_ =
EDJE_FLAGS_VERBOSE_0 =
EDJE_FLAGS_VERBOSE_1 = -v
EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) -id $(top_srcdir)/data/themes/images
-themedir = $(pkgdatadir)/themes
-theme_DATA = \
-data/themes/default.edj
-
-include data/themes/images/Makefile.mk
+filesdir = $(pkgdatadir)/themes
+files_DATA = \
+default.edj
AM_V_EDJ = $(am__v_EDJ_$(V))
am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY))
am__v_EDJ_0 = @echo " EDJ " $@;
-EXTRA_DIST += \
-data/themes/default.edc
-
-CLEANFILES += \
-data/themes/default.edj
+EXTRA_DIST = \
+default.edc
-data/themes/default.edj: Makefile data/themes/default.edc $(THEME_IMGS)
- $(MKDIR_P) $(@D)
+default.edj: Makefile default.edc
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/default.edc \
$(top_builddir)/data/themes/default.edj
diff --git a/data/themes/images/Makefile.am b/data/themes/images/Makefile.am
new file mode 100644
index 0000000..7dcfce9
--- /dev/null
+++ b/data/themes/images/Makefile.am
@@ -0,0 +1,36 @@
+MAINTAINERCLEANFILES = Makefile.in
+EXTRA_DIST = \
+dimmer.png \
+icon_arrow_right.png \
+icon_close.png \
+icon_eject.png \
+icon_exclamation.png \
+icon_forward.png \
+icon_fullscreen.png \
+icon_mute.png \
+icon_next.png \
+icon_pause.png \
+icon_play.png \
+icon_prev.png \
+icon_refresh.png \
+icon_rewind.png \
+icon_spanner.png \
+icon_stop.png \
+icon_unfullscreen.png \
+icon_volume.png \
+pm_fill.png \
+r-0.png \
+r-1.png \
+r-2.png \
+r-3.png \
+r-4.png \
+shadow_circle_horiz.png \
+shadow_circle_vert.png \
+speaker-base.png \
+speaker-over.png \
+speaker-shadow.png \
+tv-bg.png \
+tv-over.png \
+vg1.png \
+vg2.png \
+win_shadow.png
diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk
deleted file mode 100644
index b7a13a3..0000000
--- a/data/themes/images/Makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-THEME_IMGS = \
-data/themes/images/dimmer.png \
-data/themes/images/icon_arrow_right.png \
-data/themes/images/icon_close.png \
-data/themes/images/icon_eject.png \
-data/themes/images/icon_exclamation.png \
-data/themes/images/icon_forward.png \
-data/themes/images/icon_fullscreen.png \
-data/themes/images/icon_mute.png \
-data/themes/images/icon_next.png \
-data/themes/images/icon_pause.png \
-data/themes/images/icon_play.png \
-data/themes/images/icon_prev.png \
-data/themes/images/icon_refresh.png \
-data/themes/images/icon_rewind.png \
-data/themes/images/icon_spanner.png \
-data/themes/images/icon_stop.png \
-data/themes/images/icon_unfullscreen.png \
-data/themes/images/icon_volume.png \
-data/themes/images/pm_fill.png \
-data/themes/images/r-0.png \
-data/themes/images/r-1.png \
-data/themes/images/r-2.png \
-data/themes/images/r-3.png \
-data/themes/images/r-4.png \
-data/themes/images/shadow_circle_horiz.png \
-data/themes/images/shadow_circle_vert.png \
-data/themes/images/speaker-base.png \
-data/themes/images/speaker-over.png \
-data/themes/images/speaker-shadow.png \
-data/themes/images/tv-bg.png \
-data/themes/images/tv-over.png \
-data/themes/images/vg1.png \
-data/themes/images/vg2.png \
-data/themes/images/win_shadow.png
-
-EXTRA_DIST += $(THEME_IMGS)