hi,
I made some changes to the build system to fully enable separation of sources and build trees again (cvs as is supports it more or less).
one problem I encountered (which leads to the messy parts of the patch) is that edje_cc looks in the build (ie. current) directory when files are #include'd.
it's probably sufficient to add -I $(srcdir) to the cpp invocation, but I didn't managed to get that to work correctly yet.
patrick mauritz /* I'm not on the list, so please Cc: me */
Index: apps/e/src/lib/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- apps/e/src/lib/Makefile.am 6 Jan 2005 23:10:56 -0000 1.2
+++ apps/e/src/lib/Makefile.am 8 Jan 2005 16:37:15 -0000
@@ -1,7 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
INCLUDES = -I/usr/local/include \
-I$(includedir) \
- -I../bin/
+ -I$(top_srcdir)/src/bin/
@ecore_cflags@
lib_LTLIBRARIES = libe.la
Index: apps/elicit/data/themes/spring/Makefile.am
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/elicit/data/themes/spring/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- apps/elicit/data/themes/spring/Makefile.am 12 Aug 2004 22:26:27 -0000
1.4
+++ apps/elicit/data/themes/spring/Makefile.am 8 Jan 2005 16:37:15 -0000
@@ -12,7 +12,7 @@
all: $(EDC)
.edc.eet:
- edje_cc -v -id $(top_builddir)/data/themes/$(<:%.edc=%)/img -fd
$(top_builddir)/data/themes/$(<:%.edc=%)/fonts $< $@
+ cd $(srcdir); edje_cc -v -id img -fd fonts $< $(shell pwd)/$@
preview: $(EET)
edje $(EET)
Index: apps/elicit/data/themes/summer/Makefile.am
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/elicit/data/themes/summer/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- apps/elicit/data/themes/summer/Makefile.am 12 Aug 2004 22:26:28 -0000
1.1
+++ apps/elicit/data/themes/summer/Makefile.am 8 Jan 2005 16:37:15 -0000
@@ -12,7 +12,7 @@
all: $(EDC)
.edc.eet:
- edje_cc -v -id $(top_builddir)/data/themes/$(<:%.edc=%)/img -fd
$(top_builddir)/data/themes/$(<:%.edc=%)/fonts $< $@
+ cd $(srcdir); edje_cc -v -id img -fd fonts $< $(shell pwd)/$@
preview: $(EET)
edje $(EET)
Index: apps/elicit/data/themes/winter/Makefile.am
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/elicit/data/themes/winter/Makefile.am,v
retrieving revision 1.4
diff -u -r1.4 Makefile.am
--- apps/elicit/data/themes/winter/Makefile.am 12 Aug 2004 22:26:30 -0000
1.4
+++ apps/elicit/data/themes/winter/Makefile.am 8 Jan 2005 16:37:15 -0000
@@ -12,7 +12,7 @@
all: $(EDC)
.edc.eet:
- edje_cc -v -id $(top_builddir)/data/themes/$(<:%.edc=%)/img -fd
$(top_builddir)/data/themes/$(<:%.edc=%)/fonts $< $@
+ cd $(srcdir); edje_cc -v -id img -fd fonts $< $(shell pwd)/$@
preview: $(EET)
edje $(EET)
Index: apps/entice/data/themes/artifakt/Makefile.am
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entice/data/themes/artifakt/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- apps/entice/data/themes/artifakt/Makefile.am 31 Jul 2004 19:17:57
-0000 1.3
+++ apps/entice/data/themes/artifakt/Makefile.am 8 Jan 2005 16:37:15
-0000
@@ -1,8 +1,8 @@
EXTRA_DIST= artifakt.edc images.edc fonts.edc macros/macros.edc
embryo/globals.edc
SUBDIRS = parts programs images fonts
-DB = artifakt.eet
-CC = edje_cc
+DB = $(shell pwd)/artifakt.eet
+CC = cd $(srcdir); edje_cc
INCLUDES = -v -id ./images -fd ./fonts
CLEANFILES = $(DB)
Index: apps/entice/data/themes/default/Makefile.am
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entice/data/themes/default/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- apps/entice/data/themes/default/Makefile.am 3 Jun 2004 14:29:20 -0000
1.5
+++ apps/entice/data/themes/default/Makefile.am 8 Jan 2005 16:37:15 -0000
@@ -1,8 +1,8 @@
EXTRA_DIST= default.edc images.edc macros/slider.edc embryo/globals.edc
parts/status.edc programs/status.edc programs/enticepreview.edc
SUBDIRS = parts programs
-DB = default.eet
-CC = edje_cc
-INCLUDES = -v -id ../../images -fd ../../fonts
+DB = $(shell pwd)/default.eet
+CC = cd $(srcdir) ; edje_cc
+INCLUDES = -v -id $(srcdir)/../../images -fd $(srcdir)/../../fonts
CLEANFILES = $(DB)
@@ -11,5 +11,5 @@
all: $(DB)
-$(DB): default.edc
- $(CC) $(INCLUDES) default.edc $@
+$(DB): $(srcdir)/default.edc
+ $(CC) $(INCLUDES) $< $@
Index: apps/entrance/data/themes/taillights/Makefile.am
===================================================================
RCS file:
/cvsroot/enlightenment/e17/apps/entrance/data/themes/taillights/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- apps/entrance/data/themes/taillights/Makefile.am 7 Dec 2004 07:55:39
-0000 1.6
+++ apps/entrance/data/themes/taillights/Makefile.am 8 Jan 2005 16:37:15
-0000
@@ -16,9 +16,9 @@
EXTRA_DIST = $(NAME).edc
$(NAME).eet: Makefile $(NAME).edc
- $(EDJE_CC) $(EDJE_FLAGS) \
+ cd $(top_srcdir)/data/themes/$(NAME); $(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/themes/$(NAME)/$(NAME).edc \
- $(top_builddir)/data/themes/$(NAME)/$(NAME).eet
+ $(shell pwd)/$(NAME).eet
clean-local:
rm -f *.eet
Index: apps/entrance/src/daemon/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/src/daemon/Makefile.am,v
retrieving revision 1.13
diff -u -r1.13 Makefile.am
--- apps/entrance/src/daemon/Makefile.am 20 Jul 2004 18:32:44 -0000
1.13
+++ apps/entrance/src/daemon/Makefile.am 8 Jan 2005 16:37:15 -0000
@@ -12,5 +12,5 @@
entranced_LDADD = @x_libs@ -lXau @ecore_libs@ @edb_libs@
install-data-hook:
- $(mkinstalldirs) $(DESTDIR)$(prefix)/../$(localstatedir)
- chmod 700 $(DESTDIR)$(prefix)/../$(localstatedir)
+ $(mkinstalldirs) $(DESTDIR)$(localstatedir)
+ chmod 700 $(DESTDIR)$(localstatedir)
Index: libs/emotion/data/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/emotion/data/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- libs/emotion/data/Makefile.am 12 Nov 2004 00:15:55 -0000 1.5
+++ libs/emotion/data/Makefile.am 8 Jan 2005 16:37:16 -0000
@@ -31,9 +31,9 @@
theme.edc
theme.eet: Makefile
- $(EDJE_CC) $(EDJE_FLAGS) \
+ cd $(srcdir); $(EDJE_CC) $(EDJE_FLAGS) \
$(top_srcdir)/data/theme.edc \
- $(top_builddir)/data/theme.eet
+ $(shell pwd)/theme.eet
clean-local:
rm -f *.eet
Index: libs/engrave/src/lib/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/engrave/src/lib/Makefile.am,v
retrieving revision 1.7
diff -u -r1.7 Makefile.am
--- libs/engrave/src/lib/Makefile.am 6 Dec 2004 15:39:00 -0000 1.7
+++ libs/engrave/src/lib/Makefile.am 8 Jan 2005 16:37:16 -0000
@@ -31,7 +31,7 @@
engrave_canvas.h
ENGRAVEFILES = \
- engrave.y \
+ $(srcdir)/engrave.y \
engrave.l \
engrave_out.c \
engrave_data.c \
Index: libs/ewl/data/themes/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/data/themes/Makefile.am,v
retrieving revision 1.11
diff -u -r1.11 Makefile.am
--- libs/ewl/data/themes/Makefile.am 22 Aug 2004 19:37:43 -0000 1.11
+++ libs/ewl/data/themes/Makefile.am 8 Jan 2005 16:37:17 -0000
@@ -14,4 +14,4 @@
SUFFIXES = .edc .eet
.edc.eet:
- (cd $(top_srcdir)/data/themes ; edje_cc -v -id
$(top_srcdir)/data/themes/$(notdir $(<:%.edc=%))/bits/images $(notdir $<)
$(top_builddir)/data/themes/$(notdir $@))
+ (cd $(top_srcdir)/data/themes ; edje_cc -v -id
$(top_srcdir)/data/themes/$(notdir $(<:%.edc=%))/bits/images $(notdir $<)
$(shell pwd)/$(notdir $@))
Index: libs/ewl/test/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/test/Makefile.am,v
retrieving revision 1.50
diff -u -r1.50 Makefile.am
--- libs/ewl/test/Makefile.am 9 Dec 2004 01:43:34 -0000 1.50
+++ libs/ewl/test/Makefile.am 8 Jan 2005 16:37:17 -0000
@@ -2,7 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in
CFLAGS = -g -W -Wall -Wno-implicit
-INCLUDES = -I$(top_srcdir)/src @edje_cflags@
@ecore_cflags@ @evas_cflags@ @emotion_cflags@
+INCLUDES = -I$(top_srcdir)/src
-I$(top_builddir)/src @edje_cflags@ @ecore_cflags@ @evas_cflags@
@emotion_cflags@
EWLTESTPROGRAMS = ewl_test ewl_embed_test ewl_simple_test
if BUILD_EMOTION_SUPPORT
Index: libs/ewl/tools/ewl_edb_ed/Makefile.am
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/tools/ewl_edb_ed/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- libs/ewl/tools/ewl_edb_ed/Makefile.am 27 Jul 2004 03:23:28 -0000
1.1
+++ libs/ewl/tools/ewl_edb_ed/Makefile.am 8 Jan 2005 16:37:17 -0000
@@ -2,7 +2,7 @@
MAINTAINERCLEANFILES = Makefile.in
CFLAGS = -g -W -Wall -Wno-implicit
-INCLUDES = -I$(top_srcdir)/src @edje_cflags@
@ecore_cflags@ @evas_cflags@ @etox_cflags@ -I/usr/X11R6/include
+INCLUDES = -I$(top_srcdir)/src -I$(top_builddir)/src
@edje_cflags@ @ecore_cflags@ @evas_cflags@ @etox_cflags@ -I/usr/X11R6/include
bin_PROGRAMS = ewl_edb_ed
