Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore/src/lib/ecore_evas
Modified Files:
Makefile.am
Log Message:
autostuff improvements:
* use non deprecated version of AC_INIT and AM_INIT_AUTOMAKE
and check the required minimal versions.
* add bzipped distribution archive
* add AC_LIBTOOL_WIN32_DLL
* forbid libtool to check fortran
* compute libtool versioning from the version of the package
* pass the directories based on ${prefix} to the preoprocessor
with the -D option
* replace INCLUDES, wich is deprecated since 2001 by AM_CPPFLAGS
* remove useless -L flags in *_la_LDFLAGS
===================================================================
RCS file: /cvs/e/e17/libs/ecore/src/lib/ecore_evas/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- Makefile.am 26 Sep 2007 14:00:13 -0000 1.17
+++ Makefile.am 4 Nov 2007 09:29:18 -0000 1.18
@@ -3,54 +3,44 @@
if BUILD_ECORE_X
ECORE_X_INC = -I$(top_srcdir)/src/lib/ecore_x
ECORE_X_LIB = $(top_builddir)/src/lib/ecore_x/libecore_x.la
-ECORE_X_LDF = -L$(top_builddir)/src/lib/ecore_x/.libs
else
ECORE_X_INC =
-ECORE_X_LIB =
-ECORE_X_LDF =
+ECORE_X_LIB =
endif
if BUILD_ECORE_FB
ECORE_FB_INC = -I$(top_srcdir)/src/lib/ecore_fb
ECORE_FB_LIB = $(top_builddir)/src/lib/ecore_fb/libecore_fb.la
-ECORE_FB_LDF = -L$(top_builddir)/src/lib/ecore_fb/.libs
else
ECORE_FB_INC =
ECORE_FB_LIB =
-ECORE_FB_LDF =
endif
if BUILD_ECORE_DIRECTFB
ECORE_DIRECTFB_INC = -I$(top_srcdir)/src/lib/ecore_directfb [EMAIL PROTECTED]@
ECORE_DIRECTFB_LIB =
$(top_builddir)/src/lib/ecore_directfb/libecore_directfb.la
-ECORE_DIRECTFB_LDF = -L$(top_builddir)/src/lib/ecore_directfb/.libs
else
ECORE_DIRECTFB_INC =
ECORE_DIRECTFB_LIB =
-ECORE_DIRECTFB_LDF =
endif
if BUILD_ECORE_WIN32
ECORE_WIN32_INC = -I$(top_srcdir)/src/lib/ecore_win32
ECORE_WIN32_LIB = $(top_builddir)/src/lib/ecore_win32/libecore_win32.la
-ECORE_WIN32_LDF = -L$(top_builddir)/src/lib/ecore_win32/.libs
else
ECORE_WIN32_INC =
-ECORE_WIN32_LIB =
-ECORE_WIN32_LDF =
+ECORE_WIN32_LIB =
endif
if BUILD_ECORE_SDL
ECORE_SDL_INC = -I$(top_srcdir)/src/lib/ecore_sdl @sdl_cflags@
ECORE_SDL_LIB = $(top_builddir)/src/lib/ecore_sdl/libecore_sdl.la
-ECORE_SDL_LDF = -L$(top_builddir)/src/lib/ecore_sdl/.libs
else
ECORE_SDL_INC =
ECORE_SDL_LIB =
-ECORE_SDL_LDF =
endif
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/ecore \
-I$(top_srcdir)/src/lib/ecore_evas \
-I$(top_builddir)/src/lib/ecore \
@@ -63,14 +53,6 @@
@EVAS_CFLAGS@ \
@XCB_CFLAGS@
-libecore_evas_la_LDFLAGS = -version-info 1:0:0 \
-$(ECORE_X_LDF) \
-$(ECORE_FB_LDF) \
-$(ECORE_DIRECTFB_LDF) \
-$(ECORE_WIN32_LDF) \
-$(ECORE_SDL_LDF) \
--L$(top_builddir)/src/lib/ecore/.libs
-
if BUILD_ECORE_EVAS
lib_LTLIBRARIES = libecore_evas.la
@@ -98,6 +80,8 @@
@sdl_libs@ \
@XCB_LIBS@ \
@create_shared_lib@
+
+libecore_evas_la_LDFLAGS = -version-info @version_info@
libecore_evas_la_DEPENDENCIES = \
$(ECORE_X_LIB) \
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
