[Pkg-e-commits] [SCM] Enlightenment DR17 graphical layout and animation library branch, upstream-vcs, updated. dbfd1e42ab9bb65dd20f7090b52de5a835acf26f
raster
raster at alioth.debian.org
Sat Mar 15 18:28:47 UTC 2008
The following commit has been merged in the upstream-vcs branch:
commit b297cba007846398d800c1410ed31b310b200914
Author: raster <raster>
Date: Wed Mar 12 16:32:35 2008 +0000
improve build includes.
diff --git a/Makefile.am b/Makefile.am
index c3c32c0..51b69f7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
config.h.in config.sub configure install-sh \
ltconfig ltmain.sh missing mkinstalldirs \
stamp-h.in edje_docs.tar edje_docs.tar.gz edje.c \
- edje.spec depcomp compile
+ edje.spec depcomp compile edje.pc
### this is all fine and great - but edje should not be going and installing
### data in another software's data dir - it's just wrong. not to mention this
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 8b98c2b..42326c5 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I$(top_srcdir) \
--I$(top_srcdir)/bin \
+-I$(top_srcdir)/src/bin \
-I$(top_srcdir)/src/lib \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6c22a1b..3591bb9 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -4,6 +4,7 @@ MAINTAINERCLEANFILES = Makefile.in
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir) \
+-I$(top_srcdir)/src/bin \
-I$(top_srcdir)/src/lib \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
diff --git a/src/lib/edje_edit.c b/src/lib/edje_edit.c
index 93317e7..faaa9ee 100644
--- a/src/lib/edje_edit.c
+++ b/src/lib/edje_edit.c
@@ -15,10 +15,9 @@
#include <locale.h>
#include <errno.h>
-#include <Ecore_Evas.h>
#include "Edje.h"
#include "edje_private.h"
-#include "../bin/edje_cc.h"
+#include "edje_cc.h"
#include "Edje_Edit.h"
#define MAX_PATH 4096
--
Enlightenment DR17 graphical layout and animation library
More information about the Pkg-e-commits
mailing list