Enlightenment CVS committal
Author : tsauerbeck
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
Makefile.am edje_main.c edje_main.h
Log Message:
cleaned up autotools setup some more
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -3 -r1.20 -r1.21
--- Makefile.am 22 Oct 2004 02:39:48 -0000 1.20
+++ Makefile.am 30 Oct 2004 11:47:23 -0000 1.21
@@ -29,8 +29,6 @@
edje_LDADD = \
$(top_builddir)/src/lib/libedje.la
-edje_CPPFLAGS = @edje_def@
-
edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
@@ -47,8 +45,6 @@
$(top_builddir)/src/lib/libedje.la \
@IMLIB2_LIBS@
-edje_cc_CPPFLAGS = @edje_def@
-
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
@@ -62,8 +58,6 @@
$(top_builddir)/src/lib/libedje.la \
@IMLIB2_LIBS@
-edje_decc_CPPFLAGS = @edje_def@
-
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
@@ -74,8 +68,6 @@
edje_ls_LDADD = \
$(top_builddir)/src/lib/libedje.la
-edje_ls_CPPFLAGS = @edje_def@
-
edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
EXTRA_SCRIPTS = edje_recc
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- edje_main.c 20 Oct 2004 16:48:58 -0000 1.52
+++ edje_main.c 30 Oct 2004 11:47:23 -0000 1.53
@@ -74,7 +74,7 @@
ecore_app_args_set(argc, (const char **)argv);
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL);
if (!ecore_evas_init()) return -1;
-#ifndef EDJE_FB_ONLY
+#ifdef HAVE_ECORE_X_H
{
int i;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_main.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- edje_main.h 16 Jul 2004 23:33:41 -0000 1.1
+++ edje_main.h 30 Oct 2004 11:47:23 -0000 1.2
@@ -1,18 +1,22 @@
#ifndef EDJE_H
#define EDJE_H
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <Evas.h>
#include <Ecore.h>
-#ifndef EDJE_FB_ONLY
+#ifdef HAVE_ECORE_X_H
#include <Ecore_X.h>
-#else
+#endif
+#ifdef HAVE_ECORE_FB_H
#include <Ecore_Fb.h>
#endif
#include <Ecore_Evas.h>
#include <Eet.h>
#include "Edje.h"
#include "edje_private.h"
-#include "config.h"
#define DAT PACKAGE_DATA_DIR"/"
-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
