Enlightenment CVS committal
Author : doursse
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib
Modified Files:
Makefile.am
Log Message:
Autotools cleaning (not complete)
* formatting
* put WIN32_CFLAGS in AM_CFLAGS and not AM_CPPFLAGS, as it is where it belongs
* rename create_shared_lib to lt_no_undefined
* pass -Wl,--enable-auto-import to libtool when compiling with cegcc
* add files to EXTRA_DIST only when they are not in _SOURCES or
_include_HEADERS (they
are added anyway)
===================================================================
RCS file: /cvs/e/e17/libs/evas/src/lib/Makefile.am,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -3 -r1.29 -r1.30
--- Makefile.am 12 Apr 2008 00:32:25 -0000 1.29
+++ Makefile.am 23 Apr 2008 06:55:07 -0000 1.30
@@ -3,51 +3,51 @@
SUBDIRS = canvas data cache file engines imaging include
-AM_CPPFLAGS = -I. \
- -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/lib/include \
- -DPACKAGE_BIN_DIR=\"$(bindir)\" \
- -DPACKAGE_LIB_DIR=\"$(libdir)\" \
- -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
- @FREETYPE_CFLAGS@ \
- @EET_CFLAGS@ \
- @FONTCONFIG_CFLAGS@ \
- @WIN32_CFLAGS@ \
- @pthread_cflags@
-
-lib_LTLIBRARIES = libevas.la
-
-include_HEADERS = \
-Evas.h
-
-libevas_la_SOURCES = \
-main.c
-
-libevas_la_LIBADD = \
- canvas/libevas_canvas.la \
- data/libevas_data.la \
- file/libevas_file.la \
- cache/libevas_cache.la \
- imaging/libevas_imaging.la \
- engines/common/libevas_engine_common.la \
- engines/common_16/libevas_engine_common_16.la \
- -lm \
- @fnmatch_libs@ \
- @dlopen_libs@ \
- @FREETYPE_LIBS@ \
- @EET_LIBS@ \
- @FONTCONFIG_LIBS@ \
- @pthread_libs@
+AM_CPPFLAGS = \
+-I. \
+-I$(top_srcdir)/src/lib \
+-I$(top_srcdir)/src/lib/include \
+-DPACKAGE_BIN_DIR=\"$(bindir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
+
+AM_CFLAGS = @WIN32_CFLAGS@
+
+lib_LTLIBRARIES = libevas.la
+
+include_HEADERS = Evas.h
+
+libevas_la_SOURCES = main.c
+
+libevas_la_LIBADD = \
+canvas/libevas_canvas.la \
+data/libevas_data.la \
+file/libevas_file.la \
+cache/libevas_cache.la \
+imaging/libevas_imaging.la \
+engines/common/libevas_engine_common.la \
+engines/common_16/libevas_engine_common_16.la \
+-lm \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@ \
[EMAIL PROTECTED]@
libevas_la_DEPENDENCIES = \
- $(top_builddir)/config.h \
- canvas/libevas_canvas.la \
- data/libevas_data.la \
- file/libevas_file.la \
- cache/libevas_cache.la \
- imaging/libevas_imaging.la \
- engines/common/libevas_engine_common.la \
- engines/common_16/libevas_engine_common_16.la
+$(top_builddir)/config.h \
+canvas/libevas_canvas.la \
+data/libevas_data.la \
+file/libevas_file.la \
+cache/libevas_cache.la \
+imaging/libevas_imaging.la \
+engines/common/libevas_engine_common.la \
+engines/common_16/libevas_engine_common_16.la
-libevas_la_LDFLAGS = @create_shared_lib@ -version-info @version_info@
+libevas_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -version-info
@version_info@
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
