From 9e61a142a671d7a09957434320cbd4552b834aa2 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Sat, 28 Oct 2006 09:19:56 +0000 Subject: [PATCH] removing... SVN revision: 26831 --- legacy/edje/configure.in | 22 -------------- legacy/edje/data/Makefile.am | 4 +++ legacy/edje/src/bin/Makefile.am | 51 ++------------------------------- 3 files changed, 6 insertions(+), 71 deletions(-) create mode 100644 legacy/edje/data/Makefile.am diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in index 2d256644da..4fcb07d760 100644 --- a/legacy/edje/configure.in +++ b/legacy/edje/configure.in @@ -88,12 +88,6 @@ AC_PATH_GENERIC(ecore, 0.9.9, [ AC_MSG_ERROR(Ecore isn't installed) ], ) -CP=$CFLAGS -CFLAGS=$ECORE_CFLAGS -AC_CHECK_HEADER(Ecore_X.h, AC_DEFINE(HAVE_ECORE_X, 1, [Ecore_X.h exists])) -AC_CHECK_HEADER(Ecore_Fb.h, AC_DEFINE(HAVE_ECORE_FB, 1, [Ecore_Fb.h exists])) -CFLAGS=$CP - AC_PATH_GENERIC(eet, 0.9.10, [ ], [ AC_MSG_ERROR(Eet isn't installed) ], @@ -147,36 +141,20 @@ if test "x$have_edje_cc" = "xyes"; then EDJE_CC_PRG="edje_cc" EDJE_DECC_PRG="edje_decc" EDJE_RECC_PRG="edje_recc" - EDJE_THUMB_PRG="edje_thumb" else AM_CONDITIONAL(BUILD_EDJE_CC, false) AM_CONDITIONAL(BUILD_EDJE_DECC, false) - AM_CONDITIONAL(BUILD_EDJE_THUMB, false) fi AC_SUBST(EDJE_CC_PRG) AC_SUBST(EDJE_DECC_PRG) AC_SUBST(EDJE_RECC_PRG) -AC_SUBST(EDJE_THUMB_PRG) AC_OUTPUT([ edje.pc edje.spec Makefile data/Makefile -data/images/Makefile data/include/Makefile -data/src/Makefile -data/template/Makefile -data/template/embryo/Makefile -data/template/fonts/Makefile -data/template/hashes/Makefile -data/template/images/Makefile -data/template/macros/Makefile -data/template/parts/Makefile -data/template/programs/Makefile -data/test/Makefile -data/test/fonts/Makefile -data/test/images/Makefile src/Makefile src/lib/Makefile src/bin/Makefile diff --git a/legacy/edje/data/Makefile.am b/legacy/edje/data/Makefile.am new file mode 100644 index 0000000000..a5c34af967 --- /dev/null +++ b/legacy/edje/data/Makefile.am @@ -0,0 +1,4 @@ +SUBDIRS = include + +EXTRA_DIST = edc.vim + diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am index b0d64e320d..0a3b5f12c8 100644 --- a/legacy/edje/src/bin/Makefile.am +++ b/legacy/edje/src/bin/Makefile.am @@ -19,29 +19,12 @@ EXTRA_DIST = @EDJE_RECC_PRG@ EXTRA_SCRIPTS = edje_recc bin_PROGRAMS = \ -edje \ -edje_ls \ -edje_test \ @EDJE_CC_PRG@ \ -@EDJE_DECC_PRG@ \ -@EDJE_THUMB_PRG@ +@EDJE_DECC_PRG@ EXTRA_PROGRAMS = \ edje_cc \ -edje_decc \ -edje_thumb - -edje_SOURCES = \ -edje_main.c \ -edje_main.h \ -edje_prefix.c \ -edje_prefix.h - -edje_LDADD = \ -$(top_builddir)/src/lib/libedje.la - -edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la - +edje_decc edje_cc_SOURCES = \ edje_cc.c \ @@ -70,33 +53,3 @@ edje_decc_LDADD = \ $(top_builddir)/src/lib/libedje.la edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la - - -edje_thumb_SOURCES = \ -edje_thumb.c \ -edje_thumb.h - -edje_thumb_LDADD = \ -$(top_builddir)/src/lib/libedje.la - -edje_thumb_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la - - - -edje_ls_SOURCES = \ -edje_ls.c - -edje_ls_LDADD = \ -$(top_builddir)/src/lib/libedje.la - -edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la - - - -edje_test_SOURCES = \ -edje_test_main.c - -edje_test_LDADD = \ -$(top_builddir)/src/lib/libedje.la - -edje_test_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la