summaryrefslogtreecommitdiff
path: root/legacy/evas/src/modules/engines
diff options
context:
space:
mode:
authordoursse <doursse>2008-04-23 06:55:10 +0000
committerdoursse <doursse@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2008-04-23 06:55:10 +0000
commit56eacad43d77f2d6f3f5b560b69e43679c18b3b1 (patch)
tree0b6963c01d4b9cd58c15d653500a561cbbae35dc /legacy/evas/src/modules/engines
parent21f0fdb18ffc313aa1c353e74c49f53dce8cb509 (diff)
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) SVN revision: 34353
Diffstat (limited to 'legacy/evas/src/modules/engines')
-rw-r--r--legacy/evas/src/modules/engines/buffer/Makefile.am15
-rw-r--r--legacy/evas/src/modules/engines/direct3d/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/gl_glew/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/software_16/Makefile.am10
-rw-r--r--legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/software_16_sdl/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/software_ddraw/Makefile.am2
-rw-r--r--legacy/evas/src/modules/engines/software_generic/Makefile.am11
-rw-r--r--legacy/evas/src/modules/engines/software_sdl/Makefile.am16
9 files changed, 27 insertions, 35 deletions
diff --git a/legacy/evas/src/modules/engines/buffer/Makefile.am b/legacy/evas/src/modules/engines/buffer/Makefile.am
index fb24599b83..34a25b5469 100644
--- a/legacy/evas/src/modules/engines/buffer/Makefile.am
+++ b/legacy/evas/src/modules/engines/buffer/Makefile.am
@@ -6,21 +6,22 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@
10@WIN32_CFLAGS@ 10
11AM_CFLAGS = @WIN32_CFLAGS@
11 12
12if BUILD_ENGINE_BUFFER 13if BUILD_ENGINE_BUFFER
13 14
14pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH) 15pkgdir = $(libdir)/evas/modules/engines/buffer/$(MODULE_ARCH)
15 16
16pkg_LTLIBRARIES = module.la 17pkg_LTLIBRARIES = module.la
18
17module_la_SOURCES = \ 19module_la_SOURCES = \
18evas_engine.h \
19evas_engine.c \ 20evas_engine.c \
20evas_outbuf.c 21evas_outbuf.c
21 22
22module_la_LIBADD = $(top_builddir)/src/lib/libevas.la 23module_la_LIBADD = $(top_builddir)/src/lib/libevas.la
23module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 24module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
24module_la_LIBTOOLFLAGS = --tag=disable-static 25module_la_LIBTOOLFLAGS = --tag=disable-static
25module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
26 27
@@ -28,8 +29,4 @@ include_HEADERS = Evas_Engine_Buffer.h
28 29
29endif 30endif
30 31
31EXTRA_DIST = \ 32EXTRA_DIST = evas_engine.h
32evas_engine.h \
33evas_engine.c \
34evas_outbuf.c \
35Evas_Engine_Buffer.h
diff --git a/legacy/evas/src/modules/engines/direct3d/Makefile.am b/legacy/evas/src/modules/engines/direct3d/Makefile.am
index 0f8fd5c6c6..b3c14e7903 100644
--- a/legacy/evas/src/modules/engines/direct3d/Makefile.am
+++ b/legacy/evas/src/modules/engines/direct3d/Makefile.am
@@ -21,7 +21,7 @@ evas_direct3d_buffer.c \
21evas_direct3d_main.cpp 21evas_direct3d_main.cpp
22 22
23module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @direct3d_libs@ 23module_la_LIBADD = $(top_builddir)/src/lib/libevas.la @direct3d_libs@
24module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 24module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 25module_la_LIBTOOLFLAGS = --tag=disable-static
26module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
27 27
diff --git a/legacy/evas/src/modules/engines/gl_glew/Makefile.am b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
index 00eddd7a8e..aad714f2fb 100644
--- a/legacy/evas/src/modules/engines/gl_glew/Makefile.am
+++ b/legacy/evas/src/modules/engines/gl_glew/Makefile.am
@@ -20,7 +20,7 @@ evas_engine.c \
20evas_glew_main.c 20evas_glew_main.c
21 21
22module_la_LIBADD = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la @gl_libs@ @glew_libs@ 22module_la_LIBADD = $(top_builddir)/src/modules/engines/gl_common/libevas_engine_gl_common.la $(top_builddir)/src/lib/libevas.la @gl_libs@ @glew_libs@
23module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 23module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
24module_la_LIBTOOLFLAGS = --tag=disable-static 24module_la_LIBTOOLFLAGS = --tag=disable-static
25module_la_DEPENDENCIES = $(top_builddir)/config.h 25module_la_DEPENDENCIES = $(top_builddir)/config.h
26 26
diff --git a/legacy/evas/src/modules/engines/software_16/Makefile.am b/legacy/evas/src/modules/engines/software_16/Makefile.am
index cdaba8dc2e..63ad485f51 100644
--- a/legacy/evas/src/modules/engines/software_16/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16/Makefile.am
@@ -6,8 +6,9 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@
10@WIN32_CFLAGS@ 10
11AM_CFLAGS = @WIN32_CFLAGS@
11 12
12if BUILD_ENGINE_SOFTWARE_16 13if BUILD_ENGINE_SOFTWARE_16
13 14
@@ -18,11 +19,8 @@ module_la_SOURCES = \
18evas_engine.c 19evas_engine.c
19 20
20module_la_LIBADD = $(top_builddir)/src/lib/libevas.la 21module_la_LIBADD = $(top_builddir)/src/lib/libevas.la
21module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 22module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
22module_la_LIBTOOLFLAGS = --tag=disable-static 23module_la_LIBTOOLFLAGS = --tag=disable-static
23module_la_DEPENDENCIES = $(top_builddir)/config.h 24module_la_DEPENDENCIES = $(top_builddir)/config.h
24 25
25endif 26endif
26
27EXTRA_DIST = \
28evas_engine.c
diff --git a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
index 8ff3c248f9..9c1fb4f72c 100644
--- a/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_ddraw/Makefile.am
@@ -22,7 +22,7 @@ evas_ddraw_buffer.cpp \
22evas_ddraw_main.cpp 22evas_ddraw_main.cpp
23 23
24module_la_LIBADD = @ddraw_16_libs@ $(top_builddir)/src/lib/libevas.la 24module_la_LIBADD = @ddraw_16_libs@ $(top_builddir)/src/lib/libevas.la
25module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 25module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
26module_la_LIBTOOLFLAGS = --tag=disable-static 26module_la_LIBTOOLFLAGS = --tag=disable-static
27module_la_DEPENDENCIES = $(top_builddir)/config.h 27module_la_DEPENDENCIES = $(top_builddir)/config.h
28 28
diff --git a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
index ab1603d423..679d599f09 100644
--- a/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_16_sdl/Makefile.am
@@ -15,7 +15,7 @@ evas_engine.c \
15evas_engine.h 15evas_engine.h
16 16
17module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la 17module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
18module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs 18module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version -L$(top_builddir)/src/lib -L$(top_builddir)/src/lib/.libs
19module_la_DEPENDENCIES = $(top_builddir)/config.h 19module_la_DEPENDENCIES = $(top_builddir)/config.h
20 20
21include_HEADERS = Evas_Engine_SDL_16.h 21include_HEADERS = Evas_Engine_SDL_16.h
diff --git a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
index 11a94143b9..aa817b7732 100644
--- a/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_ddraw/Makefile.am
@@ -21,7 +21,7 @@ evas_ddraw_buffer.c \
21evas_ddraw_main.cpp 21evas_ddraw_main.cpp
22 22
23module_la_LIBADD = @ddraw_libs@ $(top_builddir)/src/lib/libevas.la 23module_la_LIBADD = @ddraw_libs@ $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 24module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 25module_la_LIBTOOLFLAGS = --tag=disable-static
26module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
27 27
diff --git a/legacy/evas/src/modules/engines/software_generic/Makefile.am b/legacy/evas/src/modules/engines/software_generic/Makefile.am
index 5bac1c04be..5e1e0fa3f2 100644
--- a/legacy/evas/src/modules/engines/software_generic/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_generic/Makefile.am
@@ -6,16 +6,17 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib \ 6-I$(top_srcdir)/src/lib \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@
10@WIN32_CFLAGS@ 10
11AM_CFLAGS = @WIN32_CFLAGS@
11 12
12pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH) 13pkgdir = $(libdir)/evas/modules/engines/software_generic/$(MODULE_ARCH)
13 14
14pkg_LTLIBRARIES = module.la 15pkg_LTLIBRARIES = module.la
15module_la_SOURCES = \ 16
16evas_engine.c 17module_la_SOURCES = evas_engine.c
17 18
18module_la_LIBADD = $(top_builddir)/src/lib/libevas.la 19module_la_LIBADD = $(top_builddir)/src/lib/libevas.la
19module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 20module_la_LDFLAGS = @lt_no_undefined@ @lt_enable_auto_import@ -module -avoid-version
20module_la_LIBTOOLFLAGS = --tag=disable-static 21module_la_LIBTOOLFLAGS = --tag=disable-static
21module_la_DEPENDENCIES = $(top_builddir)/config.h 22module_la_DEPENDENCIES = $(top_builddir)/config.h
diff --git a/legacy/evas/src/modules/engines/software_sdl/Makefile.am b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
index 2de71844c8..4c4c1236cc 100644
--- a/legacy/evas/src/modules/engines/software_sdl/Makefile.am
+++ b/legacy/evas/src/modules/engines/software_sdl/Makefile.am
@@ -7,8 +7,9 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib/include \ 7-I$(top_srcdir)/src/lib/include \
8-I$(top_srcdir)/src/modules/engines \ 8-I$(top_srcdir)/src/modules/engines \
9@FREETYPE_CFLAGS@ \ 9@FREETYPE_CFLAGS@ \
10@SDL_CFLAGS@ \ 10@SDL_CFLAGS@
11@WIN32_CFLAGS@ 11
12AM_CFLAGS = @WIN32_CFLAGS@
12 13
13if BUILD_ENGINE_SDL 14if BUILD_ENGINE_SDL
14 15
@@ -16,12 +17,10 @@ pkgdir = $(libdir)/evas/modules/engines/software_sdl/$(MODULE_ARCH)
16 17
17pkg_LTLIBRARIES = module.la 18pkg_LTLIBRARIES = module.la
18 19
19module_la_SOURCES = \ 20module_la_SOURCES = evas_engine.c
20evas_engine.c \
21evas_engine.h
22 21
23module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la 22module_la_LIBADD = @SDL_LIBS@ $(top_builddir)/src/lib/libevas.la
24module_la_LDFLAGS = @create_shared_lib@ -module -avoid-version 23module_la_LDFLAGS = @lt_no_undefined@ -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 24module_la_LIBTOOLFLAGS = --tag=disable-static
26module_la_DEPENDENCIES = $(top_builddir)/config.h 25module_la_DEPENDENCIES = $(top_builddir)/config.h
27 26
@@ -29,7 +28,4 @@ include_HEADERS = Evas_Engine_SDL.h
29 28
30endif 29endif
31 30
32EXTRA_DIST = \ 31EXTRA_DIST = evas_engine.h
33evas_engine.c \
34evas_engine.h \
35Evas_Engine_SDL.h