From 3e09b08e746fdc7509c20ba7bde7fd84b61cfc9f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 16 Apr 2004 02:06:39 +0000 Subject: [PATCH] survive make distcheck... SVN revision: 9747 --- legacy/edje/Makefile.am | 12 ++++++++---- legacy/edje/README | 16 +++++++++++++--- legacy/edje/configure.in | 2 +- legacy/edje/edje.c.in | 15 +++++++++++++-- legacy/edje/src/bin/Makefile.am | 11 ++++++----- legacy/edje/src/lib/Makefile.am | 4 ++-- 6 files changed, 43 insertions(+), 17 deletions(-) diff --git a/legacy/edje/Makefile.am b/legacy/edje/Makefile.am index 9dc9d947bf..2d5a45ebb1 100644 --- a/legacy/edje/Makefile.am +++ b/legacy/edje/Makefile.am @@ -15,10 +15,14 @@ install-data-local: cp -pR $$d $(DESTDIR)$(pkgdatadir)/data; \ done \ fi - if test "x${vimdir}" != "x"; then \ - $(mkinstalldirs) $(DESTDIR)$(vimdir)/syntax; \ - cp -p $(srcdir)/data/edc.vim $(DESTDIR)$(vimdir)/syntax/; \ - fi + +### this is all fine and great - ut edje should not be going and installing +### data in another software's data dir - it's just wrong. not to mention this +### also breaks make distcheck... +# if test "x${vimdir}" != "x"; then \ +# $(mkinstalldirs) $(DESTDIR)$(vimdir)/syntax; \ +# cp -p $(srcdir)/data/edc.vim $(DESTDIR)$(vimdir)/syntax/; \ +# fi dist-hook: ./gendoc; \ diff --git a/legacy/edje/README b/legacy/edje/README index 926416ec4b..e40cd1b7fc 100644 --- a/legacy/edje/README +++ b/legacy/edje/README @@ -1,4 +1,4 @@ -Edje 0.0.1 +Edje 0.5.0 A graphical layout and animation library for animated resizable, compressed and scalable themes. @@ -38,8 +38,18 @@ Quick start-up guide: sudo make install cd -4. You need imlib2 installed. any reelease from 1.0.0 on will do. -5. You already have edje. now build it: +4. You need embryo from the HEAD cvs branch + + cvs co e17/libs/embryo + cd e17/libs/embryo + ./autogen.sh + ./configure + make + sudo make install + cd + +5. You need imlib2 installed. any reelease from 1.0.0 on will do. +6. You already have edje. now build it: ./autogen.sh make diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in index 09f6f3825f..f42d5a25bb 100644 --- a/legacy/edje/configure.in +++ b/legacy/edje/configure.in @@ -8,7 +8,7 @@ AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_CANONICAL_TARGET AC_ISC_POSIX -AM_INIT_AUTOMAKE(edje, 0.0.1) +AM_INIT_AUTOMAKE(edje, 0.5.0) AM_CONFIG_HEADER(config.h) AC_PROG_CC diff --git a/legacy/edje/edje.c.in b/legacy/edje/edje.c.in index 89f4c32cc2..4adfd966e8 100644 --- a/legacy/edje/edje.c.in +++ b/legacy/edje/edje.c.in @@ -9,7 +9,7 @@ These routines are used for Edje. @mainpage Edje Library Documentation @image html edje.png -@version 0.0.1 +@version 0.5.0 @author Carsten Haitzler @date 2003-2004 @@ -137,7 +137,18 @@ quick "cheat sheet" on how to get started. sudo make install cd -4. You need Imlib2 installed. any release from 1.0.0 and up will do. +4. You need embryo from the HEAD cvs branch + + cvs co e17/libs/embryo + cd e17/libs/embryo + ./autogen.sh + ./configure + make + sudo make install + cd + + +5. You need Imlib2 installed. any release from 1.0.0 and up will do. @endverbatim diff --git a/legacy/edje/src/bin/Makefile.am b/legacy/edje/src/bin/Makefile.am index 0deacc4c20..f2aed5b9d6 100644 --- a/legacy/edje/src/bin/Makefile.am +++ b/legacy/edje/src/bin/Makefile.am @@ -15,8 +15,6 @@ edje_ls \ @EDJE_CC_PRG@ EXTRA_PROGRAMS = \ -edje \ -edje_ls \ edje_cc edje_SOURCES = \ @@ -24,15 +22,16 @@ edje_main.c \ edje.h edje_LDADD = \ -$(top_builddir)/src/lib/libedje.la \ -@imlib2_libs@ +$(top_builddir)/src/lib/libedje.la #edje_LDFLAGS = -static edje_LDFLAGS = + edje_CPPFLAGS = @edje_def@ edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la + edje_cc_SOURCES = \ edje_cc.c \ edje_cc.h \ @@ -44,18 +43,20 @@ edje_cc_handlers.c edje_cc_LDADD = \ $(top_builddir)/src/lib/libedje.la \ @imlib2_libs@ + edje_cc_CPPFLAGS = @edje_def@ edje_cc_LDFLAGS = - edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la + edje_ls_SOURCES = \ edje_ls.c edje_ls_LDADD = \ $(top_builddir)/src/lib/libedje.la + edje_ls_CPPFLAGS = @edje_def@ edje_ls_LDFLAGS = diff --git a/legacy/edje/src/lib/Makefile.am b/legacy/edje/src/lib/Makefile.am index f42943f4c4..18d3e6f7d4 100644 --- a/legacy/edje/src/lib/Makefile.am +++ b/legacy/edje/src/lib/Makefile.am @@ -41,11 +41,11 @@ edje_private.h libedje_la_LIBADD = $(LDFLAGS) -lm @evas_libs@ @ecore_libs@ @eet_libs@ @embryo_libs@ libedje_la_CPPFLAGS = @edje_def@ libedje_la_DEPENDENCIES = $(top_builddir)/config.h -libedje_la_LDFLAGS = -version-info 0:1:0 +libedje_la_LDFLAGS = -version-info 5:0:5 libedje_edit_la_SOURCES = \ edje_edit.c libedje_edit_la_LIBADD = $(LDFLAGS) -lm @evas_libs@ @ecore_libs@ @eet_libs@ @embryo_libs@ $(top_builddir)/src/lib/libedje.la libedje_edit_la_DEPENDENCIES = $(top_builddir)/config.h libedje.la -libedje_edit_la_LDFLAGS = -version-info 0:1:0 +libedje_edit_la_LDFLAGS = -version-info 5:0:5