bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Subject: Re: [E-devel] E SVN: discomfitor trunk/edje/src/bin 

Date: Wed, 23 Feb 2011 20:25:38 +0100 (CET)

On Wed, 23 Feb 2011, Mike Blumenkrantz wrote:
> vtorri! help!!!! :(  

try the attached patch

Vincent


SVN revision: 57284
This commit is contained in:
Mike Blumenkrantz 2011-02-23 20:30:14 +00:00
parent 04ccb0a4b4
commit d60c6a85da
4 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
legacy/edje/configure.ac
View File

@ -295,8 +295,8 @@ if test "x$have_edje_cc" = "xyes"; then
PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0]) PKG_CHECK_MODULES([EDJE_CC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])
EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}" EDJE_CC_LIBS="${EDJE_CC_LIBS} ${LUA_LIBS} ${lua_libs}"
fi fi
AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"]) AM_CONDITIONAL([BUILD_EPP], [test "x$have_edje_cc" = "xyes"])
AC_DEFINE_UNQUOTED([EPPDIR], ["${libdir}/${PACKAGE}/utils"], [directory where epp will be installed])
if test "x$have_edje_decc" = "xyes"; then if test "x$have_edje_decc" = "xyes"; then
PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0]) PKG_CHECK_MODULES([EDJE_DECC], [ecore-file >= 1.0.0 ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eet >= 1.0.0 eina >= 1.0.0])

4
legacy/edje/src/bin/Makefile.am
View File

@ -1,7 +1,8 @@
MAINTAINERCLEANFILES = Makefile.in
if BUILD_EPP if BUILD_EPP
SUBDIRS = epp SUBDIRS = epp
endif endif
MAINTAINERCLEANFILES = Makefile.in
bin_SCRIPTS = @EDJE_RECC_PRG@ bin_SCRIPTS = @EDJE_RECC_PRG@
@ -24,6 +25,7 @@ edje_cc_CPPFLAGS = \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DEPP_DIR=\"$(libdir)/$(PACKAGE)/utils\" \
@EDJE_CFLAGS@ @EDJE_CC_CFLAGS@ @EVIL_CFLAGS@ @EDJE_CFLAGS@ @EDJE_CC_CFLAGS@ @EVIL_CFLAGS@
edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CC_LIBS@ @EVIL_LIBS@ -lm edje_cc_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CC_LIBS@ @EVIL_LIBS@ -lm
edje_cc_LDFLAGS = @lt_enable_auto_import@ edje_cc_LDFLAGS = @lt_enable_auto_import@

12
legacy/edje/src/bin/edje_cc_parse.c
View File

@ -693,12 +693,12 @@ compile(void)
* Run the input through the C pre-processor. * Run the input through the C pre-processor.
*/ */
ret = -1; ret = -1;
if (ecore_file_exists(EPPDIR"/epp")) if (ecore_file_exists(EPP_DIR"/epp"))
{ {
snprintf(buf, sizeof(buf), EPPDIR"/epp -I%s %s -P -o %s - < %s", snprintf(buf, sizeof(buf), EPP_DIR"/epp -I%s %s -P -o %s - < %s",
inc, def, tmpn, file_in); inc, def, tmpn, file_in);
ret = system(buf); ret = system(buf);
} }
/* /*
* On OpenSolaris, the default cpp is located in different places. * On OpenSolaris, the default cpp is located in different places.
* Alan Coppersmith told me to do what xorg does: using /usr/ccs/lib/cpp * Alan Coppersmith told me to do what xorg does: using /usr/ccs/lib/cpp

22
legacy/edje/src/bin/epp/Makefile.am
View File

@ -18,20 +18,24 @@
#the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. #the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
MAINTAINERCLEANFILES = Makefile.in MAINTAINERCLEANFILES = Makefile.in
eppdir = @libdir@/@PACKAGE@/utils eppdir = @libdir@/@PACKAGE@/utils
epp_PROGRAMS = epp epp_PROGRAMS = epp
epp_SOURCES = \ epp_SOURCES = \
cpplib.h \ cpplib.h \
cpphash.h \ cpphash.h \
cppalloc.c \ cppalloc.c \
cpperror.c \ cpperror.c \
cppexp.c \ cppexp.c \
cpphash.c \ cpphash.c \
cpplib.c \ cpplib.c \
cppmain.c cppmain.c
epp_CPPFLAGS = -I$(top_builddir) $(CWARNFLAGS) epp_CPPFLAGS = \
-I$(top_builddir) \
$(CWARNFLAGS)
DEFS= \ DEFS= \
-DHAVE_STRERROR \ -DHAVE_STRERROR \