From f2056229e7d958fe53102e54c83f6b15299f6c7f Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 19 May 2006 09:27:33 +0000 Subject: [PATCH] 1. fix ecore to build again (xcomp - u need to cvs add and commit your 2 new .c files!) and asparagus! SVN revision: 22732 --- legacy/ecore/configure.in | 2 +- legacy/ecore/src/lib/ecore_x/Makefile.am | 14 ++++++++++---- legacy/edje/configure.in | 2 +- legacy/eet/configure.in | 4 +--- legacy/embryo/Makefile.am | 2 -- legacy/embryo/configure.in | 4 +--- legacy/evas/Makefile.am | 2 +- legacy/evas/configure.in | 3 +-- 8 files changed, 16 insertions(+), 17 deletions(-) diff --git a/legacy/ecore/configure.in b/legacy/ecore/configure.in index 8fbd2972ca..ec87198ded 100644 --- a/legacy/ecore/configure.in +++ b/legacy/ecore/configure.in @@ -4,7 +4,7 @@ AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(ecore, 0.9.9.026) +AM_INIT_AUTOMAKE(ecore, 0.9.9.027) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN diff --git a/legacy/ecore/src/lib/ecore_x/Makefile.am b/legacy/ecore/src/lib/ecore_x/Makefile.am index f6b25eaaa5..ddce0a78ff 100644 --- a/legacy/ecore/src/lib/ecore_x/Makefile.am +++ b/legacy/ecore/src/lib/ecore_x/Makefile.am @@ -30,13 +30,16 @@ Ecore_X.h \ Ecore_X_Atoms.h \ Ecore_X_Cursor.h +## FIXME: disabled until xcomp adds this file in +# ecore_x_fixes.c \ +# ecore_x_damage.c \ +# + libecore_x_la_SOURCES = \ ecore_x.c \ ecore_x_dnd.c \ ecore_x_sync.c \ ecore_x_randr.c \ -ecore_x_fixes.c \ -ecore_x_damage.c \ ecore_x_error.c \ ecore_x_events.c \ ecore_x_icccm.c \ @@ -73,6 +76,11 @@ $(top_builddir)/src/lib/ecore/libecore.la \ $(top_builddir)/src/lib/ecore_txt/libecore_txt.la \ $(top_builddir)/src/lib/ecore_job/libecore_job.la +## FIXME: disabled until xcomp adds this file in +# ecore_x_fixes.c \ +# ecore_x_damage.c \ +# + endif EXTRA_DIST = \ @@ -82,8 +90,6 @@ Ecore_X_Cursor.h \ ecore_x.c \ ecore_x_dnd.c \ ecore_x_sync.c \ -ecore_x_fixes.c \ -ecore_x_damage.c \ ecore_x_randr.c \ ecore_x_error.c \ ecore_x_events.c \ diff --git a/legacy/edje/configure.in b/legacy/edje/configure.in index ea5b8a155b..fe0e59cb6f 100644 --- a/legacy/edje/configure.in +++ b/legacy/edje/configure.in @@ -7,7 +7,7 @@ AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(edje, 0.5.0.026) +AM_INIT_AUTOMAKE(edje, 0.5.0.027) AM_CONFIG_HEADER(config.h) AC_PROG_CC diff --git a/legacy/eet/configure.in b/legacy/eet/configure.in index f914d318c4..bd6724b219 100644 --- a/legacy/eet/configure.in +++ b/legacy/eet/configure.in @@ -1,5 +1,3 @@ -dnl Process this file with autoconf to produce a configure script. - # get rid of that stupid cache mechanism rm -f config.cache @@ -7,7 +5,7 @@ AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(eet, 0.9.10.026) +AM_INIT_AUTOMAKE(eet, 0.9.10.027) AM_CONFIG_HEADER(config.h) AC_PROG_CC diff --git a/legacy/embryo/Makefile.am b/legacy/embryo/Makefile.am index dc6524f363..e51a57f8fe 100644 --- a/legacy/embryo/Makefile.am +++ b/legacy/embryo/Makefile.am @@ -1,5 +1,3 @@ -## Process this file with automake to produce Makefile.in - SUBDIRS = src include examples MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \ diff --git a/legacy/embryo/configure.in b/legacy/embryo/configure.in index 666fd8c8a4..2ad4dda999 100644 --- a/legacy/embryo/configure.in +++ b/legacy/embryo/configure.in @@ -1,5 +1,3 @@ -dnl Process this file with autoconf to produce a configure script. - # get rid of that stupid cache mechanism rm -f config.cache @@ -7,7 +5,7 @@ AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AM_INIT_AUTOMAKE(embryo, 0.9.1.026) +AM_INIT_AUTOMAKE(embryo, 0.9.1.027) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN diff --git a/legacy/evas/Makefile.am b/legacy/evas/Makefile.am index 76ab0194f1..ebfa4fb65c 100644 --- a/legacy/evas/Makefile.am +++ b/legacy/evas/Makefile.am @@ -1,4 +1,4 @@ -ACLOCAL_AMFLAGS = -I m4 +# ACLOCAL_AMFLAGS = -I m4 SUBDIRS = data src proj diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in index f9a83b4d72..7c257b2a57 100644 --- a/legacy/evas/configure.in +++ b/legacy/evas/configure.in @@ -5,8 +5,7 @@ AC_INIT(configure.in) AC_CANONICAL_BUILD AC_CANONICAL_HOST AC_ISC_POSIX -AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE(evas, 0.9.9.026) +AM_INIT_AUTOMAKE(evas, 0.9.9.027) AM_CONFIG_HEADER(config.h) AC_C_BIGENDIAN