vtorri
/
rage
forked from enlightenment/rage
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "improve build system to use only one makefile" 

This reverts commit 25ffdc470c.

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.
This commit is contained in:
Carsten Haitzler 2016-05-27 12:31:57 +09:00
parent 88677dfb11
commit 43d1998c5f
13 changed files with 112 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile.am
View File

@ -1,8 +1,7 @@
AUTOMAKE_OPTIONS = subdir-objects
ACLOCAL_AMFLAGS = -I m4
DISTCLEANFILES =
CLEANFILES =
SUBDIRS = src data
MAINTAINERCLEANFILES = \
Makefile.in \
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
@ -31,10 +30,5 @@ 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."

7
configure.ac
View File

@ -30,6 +30,13 @@ 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

3
data/Makefile.am Normal file
View File

@ -0,0 +1,3 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = desktop icons themes

6
data/desktop/Makefile.am Normal file
View File

@ -0,0 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/applications
files_DATA = \
rage.desktop
EXTRA_DIST = $(files_DATA)

5
data/desktop/Makefile.mk
View File

@ -1,5 +0,0 @@
desktopdir = $(datadir)/applications
desktop_DATA = \
data/desktop/rage.desktop
EXTRA_DIST += $(desktop_DATA)

6
data/icons/Makefile.am Normal file
View File

@ -0,0 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
filesdir = $(datadir)/icons
files_DATA = \
rage.png
EXTRA_DIST = $(files_DATA)

5
data/icons/Makefile.mk
View File

@ -1,5 +0,0 @@
icondir = $(datadir)/icons
icon_DATA = \
data/icons/rage.png
EXTRA_DIST += $(icon_DATA)

22
data/themes/Makefile.mk → data/themes/Makefile.am
View File

@ -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
EXTRA_DIST = \
default.edc
CLEANFILES += \
data/themes/default.edj
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

36
data/themes/images/Makefile.am Normal file
View File

@ -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

37
data/themes/images/Makefile.mk
View File

@ -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)

2
src/Makefile.am Normal file
View File

@ -0,0 +1,2 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = bin

40
src/bin/Makefile.am Normal file
View File

@ -0,0 +1,40 @@
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 \
browser.c browser.h
internal_bindir = $(libdir)/rage/utils
internal_bin_PROGRAMS = rage_thumb
rage_thumb_SOURCES = \
thumb.c \
sha1.c sha1.h \
albumart.c albumart.h
rage_thumb_LDADD = @RAGE_LIBS@
rage_thumb_CPPFLAGS = -I. \
-DPACKAGE_BIN_DIR=\"$(bindir)\" -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" @RAGE_CFLAGS@

52
src/bin/Makefile.mk
View File

@ -1,52 +0,0 @@
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/browser.c \
src/bin/browser.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/albumart.c \
src/bin/albumart.h \
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@