prep for 1.0 -> edje_convert no longer needed/used. if you havent

converted by now... too late. thats pre 1.0 - history.

git-svn-id: http://svn.enlightenment.org/svn/e/trunk/edje@56156 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index d259500..ebdfd32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,6 @@ EFL_ENABLE_BIN([edje-cc])
 EFL_ENABLE_BIN([edje-decc])
 EFL_ENABLE_BIN([edje-recc])
 EFL_ENABLE_BIN([edje-player])
-EFL_ENABLE_BIN([edje-convert])
 EFL_ENABLE_BIN([edje-inspector])
 EFL_ENABLE_BIN([edje-external-inspector])
 
@@ -304,11 +303,6 @@ if test "x$have_edje_player" = "xyes"; then
    PKG_CHECK_MODULES([EDJE_PLAYER], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
 fi
 
-if test "x$have_edje_convert" = "xyes"; then
-   PKG_CHECK_MODULES([EDJE_CONVERT], [eet >= 1.0.0 eina >= 1.0.0])
-   EDJE_CONVERT_LIBS="${EDJE_CONVERT_LIBS} ${LUA_LIBS} ${lua_libs}"
-fi
-
 if test "x$have_edje_inspector" = "xyes"; then
    PKG_CHECK_MODULES([EDJE_INSPECTOR], [ecore-evas >= 1.0.0 ecore >= 1.0.0 evas >= 1.0.0 eina >= 1.0.0])
 fi
@@ -416,7 +410,6 @@ echo "  Build edje_cc................: $have_edje_cc"
 echo "  Build edje_decc..............: $have_edje_decc"
 echo "  Build edje_recc..............: $have_edje_recc"
 echo "  Build edje_player............: $have_edje_player"
-echo "  Build edje_convert...........: $have_edje_convert"
 echo "  Build edje_inspector.........: $have_edje_inspector"
 echo "  Build edje_external_inspector: $have_edje_external_inspector"
 echo

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index e3214f6..0fb7ffb 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -3,9 +3,9 @@ MAINTAINERCLEANFILES = Makefile.in
 
 bin_SCRIPTS = @EDJE_RECC_PRG@
 
-bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_CONVERT_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
+bin_PROGRAMS = @EDJE_CC_PRG@ @EDJE_DECC_PRG@ @EDJE_PLAYER_PRG@ @EDJE_INSPECTOR_PRG@ @EDJE_EXTERNAL_INSPECTOR_PRG@
 
-EXTRA_PROGRAMS = edje_cc edje_decc edje_player edje_convert edje_inspector edje_external_inspector
+EXTRA_PROGRAMS = edje_cc edje_decc edje_player edje_inspector edje_external_inspector
 
 edje_cc_SOURCES = \
 edje_cc.c \
@@ -48,14 +48,6 @@ edje_player_CPPFLAGS = \
 edje_player_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_PLAYER_LIBS@ @EVIL_LIBS@
 edje_player_LDFLAGS = @lt_enable_auto_import@
 
-edje_convert_SOURCES = edje_convert.c edje_convert_main.c edje_data_convert.c
-edje_convert_CPPFLAGS = \
--I$(top_srcdir)/src/bin \
--I$(top_srcdir)/src/lib \
-@EDJE_CFLAGS@ @EDJE_CONVERT_CFLAGS@
-edje_convert_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_CONVERT_LIBS@
-edje_convert_LDFLAGS = @lt_enable_auto_import@
-
 edje_inspector_SOURCES = edje_inspector.c
 edje_inspector_CPPFLAGS = \
 -I$(top_srcdir)/src/bin \
@@ -73,5 +65,5 @@ edje_external_inspector_LDADD = $(top_builddir)/src/lib/libedje.la @EDJE_EXTERNA
 edje_external_inspector_LDFLAGS = @lt_enable_auto_import@
 
 
-EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.h
+EXTRA_DIST = @EDJE_RECC_PRG@ edje_prefix.h edje_cc.h edje_convert.hedje_convert.c edje_convert_main.c edje_data_convert.c
 EXTRA_SCRIPTS = edje_recc