discomfitor pushed a commit to branch master. http://git.enlightenment.org/apps/rage.git/commit/?id=25ffdc470cdd28d4c55782563b833151641a0356
commit 25ffdc470cdd28d4c55782563b833151641a0356 Author: Mike Blumenkrantz <[email protected]> Date: Sat Aug 9 11:57:40 2014 -0400 improve build system to use only one makefile --- Makefile.am | 10 ++++-- configure.ac | 7 ----- data/Makefile.am | 3 -- data/desktop/Makefile.am | 6 ---- data/desktop/Makefile.mk | 5 +++ data/icons/Makefile.am | 6 ---- data/icons/Makefile.mk | 5 +++ data/themes/{Makefile.am => Makefile.mk} | 22 +++++++------ data/themes/images/Makefile.am | 52 ------------------------------- data/themes/images/Makefile.mk | 53 ++++++++++++++++++++++++++++++++ src/Makefile.am | 2 -- src/bin/Makefile.am | 37 ---------------------- src/bin/Makefile.mk | 48 +++++++++++++++++++++++++++++ 13 files changed, 131 insertions(+), 125 deletions(-) diff --git a/Makefile.am b/Makefile.am index ccc377d..8c91be9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,8 @@ +AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src data - +DISTCLEANFILES = +CLEANFILES = MAINTAINERCLEANFILES = \ Makefile.in \ $(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \ @@ -30,5 +31,10 @@ EXTRA_DIST = README AUTHORS COPYING autogen.sh rage.spec pkgbuild/PKGBUILD .PHONY: doc +include src/bin/Makefile.mk +include data/desktop/Makefile.mk +include data/icons/Makefile.mk +include data/themes/Makefile.mk + doc: @echo "Empty doc target until we have real documentation." diff --git a/configure.ac b/configure.ac index ff72fcd..add2d71 100644 --- a/configure.ac +++ b/configure.ac @@ -29,13 +29,6 @@ EFL_WITH_BIN([edje], [edje-cc], [edje_cc]) AC_CONFIG_FILES([ Makefile rage.spec -src/Makefile -src/bin/Makefile -data/Makefile -data/desktop/Makefile -data/icons/Makefile -data/themes/Makefile -data/themes/images/Makefile pkgbuild/PKGBUILD ]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 4379365..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = desktop icons themes - diff --git a/data/desktop/Makefile.am b/data/desktop/Makefile.am deleted file mode 100644 index bce3b5b..0000000 --- a/data/desktop/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -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 new file mode 100644 index 0000000..1e1d103 --- /dev/null +++ b/data/desktop/Makefile.mk @@ -0,0 +1,5 @@ +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 deleted file mode 100644 index 1f12837..0000000 --- a/data/icons/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -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 new file mode 100644 index 0000000..5a9f464 --- /dev/null +++ b/data/icons/Makefile.mk @@ -0,0 +1,5 @@ +icondir = $(datadir)/icons +icon_DATA = \ +data/icons/rage.png + +EXTRA_DIST += $(icon_DATA) diff --git a/data/themes/Makefile.am b/data/themes/Makefile.mk similarity index 60% rename from data/themes/Makefile.am rename to data/themes/Makefile.mk index f601a59..29d7606 100644 --- a/data/themes/Makefile.am +++ b/data/themes/Makefile.mk @@ -1,25 +1,27 @@ -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 -filesdir = $(pkgdatadir)/themes -files_DATA = \ -default.edj +themedir = $(pkgdatadir)/themes +theme_DATA = \ +data/themes/default.edj + +include data/themes/images/Makefile.mk AM_V_EDJ = $(am__v_EDJ_$(V)) am__v_EDJ_ = $(am__v_EDJ_$(AM_DEFAULT_VERBOSITY)) am__v_EDJ_0 = @echo " EDJ " $@; -EXTRA_DIST = \ -default.edc +EXTRA_DIST += \ +data/themes/default.edc + +CLEANFILES += \ +data/themes/default.edj -default.edj: Makefile default.edc +data/themes/default.edj: Makefile data/themes/default.edc $(THEME_IMGS) + $(MKDIR_P) $(@D) $(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 deleted file mode 100644 index 92babfa..0000000 --- a/data/themes/images/Makefile.am +++ /dev/null @@ -1,52 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -EXTRA_DIST = \ -pm_fill.png \ -pm_overlay.png \ -pm_shadow.png \ -glow_exclam.png \ -icon_eject.png \ -icon_forward.png \ -icon_mute.png \ -icon_next.png \ -icon_pause.png \ -icon_play.png \ -icon_prev.png \ -icon_rewind.png \ -icon_stop.png \ -icon_volume.png \ -icon_refresh.png \ -icon_arrow_right.png \ -horizontal_separated_bar_small_glow.png \ -vgrad_shadow_bi.png \ -pos_indicator.png \ -icon_next2.png \ -icon_prev2.png \ -icon_play2.png \ -icon_pause2.png \ -icon_spanner.png \ -icon_spanner2.png \ -icon_volume2.png \ -pos_indicator_big.png \ -bevel_dark_out.png \ -bg_bevel.png \ -win_glow.png \ -win_shadow.png \ -bg_glint.png \ -bg_shine.png \ -tv-bg.png \ -tv-over.png \ -r-0.png \ -r-1.png \ -r-2.png \ -r-3.png \ -r-4.png \ -icon_close.png \ -icon_close2.png \ -icon_fullscreen.png \ -icon_fullscreen2.png \ -icon_unfullscreen.png \ -icon_unfullscreen2.png \ -inset_round_hilight.png \ -inset_round_shading.png \ -inset_round_shadow.png \ -speaker.png diff --git a/data/themes/images/Makefile.mk b/data/themes/images/Makefile.mk new file mode 100644 index 0000000..390abcd --- /dev/null +++ b/data/themes/images/Makefile.mk @@ -0,0 +1,53 @@ +THEME_IMGS = \ +data/themes/images/bevel_dark_out.png \ +data/themes/images/bg_bevel.png \ +data/themes/images/bg_glint.png \ +data/themes/images/bg_shine.png \ +data/themes/images/glow_exclam.png \ +data/themes/images/horizontal_separated_bar_small_glow.png \ +data/themes/images/icon_arrow_right.png \ +data/themes/images/icon_close2.png \ +data/themes/images/icon_close.png \ +data/themes/images/icon_eject.png \ +data/themes/images/icon_forward.png \ +data/themes/images/icon_fullscreen2.png \ +data/themes/images/icon_fullscreen.png \ +data/themes/images/icon_mute.png \ +data/themes/images/icon_next2.png \ +data/themes/images/icon_next.png \ +data/themes/images/icon_pause2.png \ +data/themes/images/icon_pause.png \ +data/themes/images/icon_play2.png \ +data/themes/images/icon_play.png \ +data/themes/images/icon_prev2.png \ +data/themes/images/icon_prev.png \ +data/themes/images/icon_refresh.png \ +data/themes/images/icon_rewind.png \ +data/themes/images/icon_spanner2.png \ +data/themes/images/icon_spanner.png \ +data/themes/images/icon_stop.png \ +data/themes/images/icon_unfullscreen2.png \ +data/themes/images/icon_unfullscreen.png \ +data/themes/images/icon_volume2.png \ +data/themes/images/icon_volume.png \ +data/themes/images/inset_round_hilight.png \ +data/themes/images/inset_round_shading.png \ +data/themes/images/inset_round_shadow.png \ +data/themes/images/pm_fill.png \ +data/themes/images/pm_overlay.png \ +data/themes/images/pm_shadow.png \ +data/themes/images/pos_indicator_big.png \ +data/themes/images/pos_indicator.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/speaker.png \ +data/themes/images/tv-bg.png \ +data/themes/images/tv-over.png \ +data/themes/images/vgrad_shadow_bi.png \ +data/themes/images/win_glow.png \ +data/themes/images/win_shadow.png + +EXTRA_DIST += $(THEME_IMGS) diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index ccfbf1a..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in -SUBDIRS = bin diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index 358121a..0000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AUTOMAKE_OPTIONS = subdir-objects -MAINTAINERCLEANFILES = Makefile.in - -bin_PROGRAMS = rage - -rage_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @RAGE_CFLAGS@ - -rage_LDADD = @RAGE_LIBS@ - -rage_SOURCES = \ -controls.c controls.h \ -dnd.c dnd.h \ -gesture.c gesture.h \ -key.c key.h \ -main.c main.h \ -video.c video.h \ -winvid.c winvid.h \ -win.c win.h \ -winlist.c winlist.h \ -config.c config.h \ -sha1.c sha1.h \ -videothumb.c videothumb.h \ -albumart.c albumart.h - -internal_bindir = $(libdir)/rage/utils -internal_bin_PROGRAMS = rage_thumb - -rage_thumb_SOURCES = \ -thumb.c \ -sha1.c sha1.h - -rage_thumb_LDADD = @RAGE_LIBS@ -rage_thumb_CPPFLAGS = -I. \ --DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @RAGE_CFLAGS@ diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk new file mode 100644 index 0000000..6e39b02 --- /dev/null +++ b/src/bin/Makefile.mk @@ -0,0 +1,48 @@ +bin_PROGRAMS = src/bin/rage + +src_bin_rage_CPPFLAGS = -I. \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @RAGE_CFLAGS@ + +src_bin_rage_LDADD = @RAGE_LIBS@ + +src_bin_rage_SOURCES = \ +src/bin/albumart.c \ +src/bin/albumart.h \ +src/bin/config.c \ +src/bin/config.h \ +src/bin/controls.c \ +src/bin/controls.h \ +src/bin/dnd.c \ +src/bin/dnd.h \ +src/bin/gesture.c \ +src/bin/gesture.h \ +src/bin/key.c \ +src/bin/key.h \ +src/bin/main.c \ +src/bin/main.h \ +src/bin/sha1.c \ +src/bin/sha1.h \ +src/bin/video.c \ +src/bin/video.h \ +src/bin/videothumb.c \ +src/bin/videothumb.h \ +src/bin/win.c \ +src/bin/win.h \ +src/bin/winlist.c \ +src/bin/winlist.h \ +src/bin/winvid.c \ +src/bin/winvid.h + +internal_bindir = $(libdir)/rage/utils +internal_bin_PROGRAMS = src/bin/rage_thumb + +src_bin_rage_thumb_SOURCES = \ +src/bin/thumb.c \ +src/bin/sha1.c \ +src/bin/sha1.h + +src_bin_rage_thumb_LDADD = @RAGE_LIBS@ +src_bin_rage_thumb_CPPFLAGS = -Isrc/bin \ +-DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @RAGE_CFLAGS@ --
