From 49d92b02775f9e7152bcfcc276a9df22b75ef1d3 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Thu, 21 Oct 2004 08:06:13 +0000 Subject: [PATCH] distcheck SVN revision: 11947 --- legacy/ecore/src/bin/Makefile.am | 4 ++-- legacy/evas/src/bin/Makefile.am | 21 +++++++++---------- legacy/evas/src/lib/Makefile.am | 2 +- legacy/evas/src/lib/canvas/Makefile.am | 2 +- legacy/evas/src/lib/data/Makefile.am | 2 +- .../evas/src/lib/engines/buffer/Makefile.am | 3 +-- .../src/lib/engines/cairo_common/Makefile.am | 3 +-- .../src/lib/engines/cairo_x11/Makefile.am | 3 +-- .../evas/src/lib/engines/common/Makefile.am | 3 +-- .../evas/src/lib/engines/directfb/Makefile.am | 2 +- legacy/evas/src/lib/engines/fb/Makefile.am | 3 +-- .../src/lib/engines/gl_common/Makefile.am | 3 +-- .../evas/src/lib/engines/gl_x11/Makefile.am | 3 +-- .../lib/engines/software_qtopia/Makefile.am | 3 +-- .../src/lib/engines/software_x11/Makefile.am | 3 +-- legacy/evas/src/lib/file/Makefile.am | 2 +- legacy/evas/src/lib/imaging/Makefile.am | 2 +- 17 files changed, 27 insertions(+), 37 deletions(-) diff --git a/legacy/ecore/src/bin/Makefile.am b/legacy/ecore/src/bin/Makefile.am index 461a4e139a..9f32cab6d3 100644 --- a/legacy/ecore/src/bin/Makefile.am +++ b/legacy/ecore/src/bin/Makefile.am @@ -89,7 +89,7 @@ $(ECORE_IPC_LIB) \ $(ECORE_TXT_LIB) \ -lm @iconv_libs@ -ecore_test_LDFLAGS = +#ecore_test_LDFLAGS = ecore_test_CFLAGS = \ $(CFLAGS) \ @@ -123,7 +123,7 @@ $(ECORE_IPC_LIB) \ $(ECORE_TXT_LIB) \ -lm @iconv_libs@ -ecore_evas_test_LDFLAGS = +#ecore_evas_test_LDFLAGS = ecore_evas_test_CFLAGS = \ $(CFLAGS) \ diff --git a/legacy/evas/src/bin/Makefile.am b/legacy/evas/src/bin/Makefile.am index c8ef8bfc95..ab5703dfd2 100644 --- a/legacy/evas/src/bin/Makefile.am +++ b/legacy/evas/src/bin/Makefile.am @@ -29,44 +29,43 @@ SUBDIRS = evas_software_win32 evas_software_x11_test_SOURCES = evas_test_main.h evas_test_main.c evas_software_x11_main.c evas_software_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ -#evas_software_x11_test_LDFLAGS = $(LDFLAGS) -static -evas_software_x11_test_LDFLAGS = $(LDFLAGS) +#evas_software_x11_test_LDFLAGS = evas_software_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ evas_software_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_software_x11_perf_test_SOURCES = evas_software_x11_perf_test.c evas_software_x11_perf_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ -evas_software_x11_perf_test_LDFLAGS = $(LDFLAGS) +#evas_software_x11_perf_test_LDFLAGS = evas_software_x11_perf_test_CFLAGS = $(CFLAGS) @x_cflags@ evas_software_x11_perf_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_software_x11_perf_load_SOURCES = evas_software_x11_perf_load.c evas_software_x11_perf_load_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ -evas_software_x11_perf_load_LDFLAGS = $(LDFLAGS) +#evas_software_x11_perf_load_LDFLAGS = evas_software_x11_perf_load_CFLAGS = $(CFLAGS) @x_cflags@ evas_software_x11_perf_load_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_directfb_test_SOURCES = evas_test_main.h evas_test_main.c evas_directfb_main.c evas_directfb_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @DIRECTFB_LIBS@ -evas_directfb_test_LDFLAGS = $(LDFLAGS) +#evas_directfb_test_LDFLAGS = evas_directfb_test_CFLAGS = $(CFLAGS) @DIRECTFB_CFLAGS@ evas_directfb_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_directfb_window_SOURCES = evas_test_main.h evas_test_main.c evas_directfb_window.c evas_directfb_window_LDADD = $(top_builddir)/src/lib/libevas.la -lm @DIRECTFB_LIBS@ -evas_directfb_window_LDFLAGS = $(LDFLAGS) +#evas_directfb_window_LDFLAGS = evas_directfb_window_CFLAGS = $(CFLAGS) @DIRECTFB_CFLAGS@ evas_directfb_window_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_fb_test_SOURCES = evas_test_main.h evas_test_main.c evas_fb_main.c evas_fb_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm -evas_fb_test_LDFLAGS = $(LDFLAGS) +#evas_fb_test_LDFLAGS = evas_fb_test_CFLAGS = $(CFLAGS) evas_fb_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_buffer_test_SOURCES = evas_test_main.h evas_test_main.c evas_buffer_main.c evas_buffer_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm -evas_buffer_test_LDFLAGS = $(LDFLAGS) +#evas_buffer_test_LDFLAGS = evas_buffer_test_CFLAGS = $(CFLAGS) evas_buffer_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la @@ -76,7 +75,7 @@ moc_evas_software_qtopia_main.cpp: evas_software_qtopia_main.h evas_software_qtopia_test_SOURCES = evas_test_main.h evas_test_main.c evas_software_qtopia_main.h evas_software_qtopia_main.cpp moc_evas_software_qtopia_main.cpp evas_software_qtopia_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @qt_libs@ -evas_software_qtopia_test_LDFLAGS = $(LDFLAGS) +#evas_software_qtopia_test_LDFLAGS = evas_software_qtopia_test_CFLAGS = $(CFLAGS) @qt_cflags@ evas_software_qtopia_test_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) @qt_cflags@ evas_software_qtopia_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la @@ -84,13 +83,13 @@ endif evas_gl_x11_test_SOURCES = evas_test_main.h evas_test_main.c evas_gl_x11_main.c evas_gl_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ @gl_libs@ -evas_gl_x11_test_LDFLAGS = $(LDFLAGS) +#evas_gl_x11_test_LDFLAGS = evas_gl_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ @gl_cflags@ evas_gl_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la evas_cairo_x11_test_SOURCES = evas_test_main.h evas_test_main.c evas_cairo_x11_main.c evas_cairo_x11_test_LDADD = $(top_builddir)/src/lib/libevas.la -lm @x_libs@ @CAIRO_LIBS@ -evas_cairo_x11_test_LDFLAGS = $(LDFLAGS) +#evas_cairo_x11_test_LDFLAGS = evas_cairo_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ @CAIRO_CFLAGS@ evas_cairo_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la diff --git a/legacy/evas/src/lib/Makefile.am b/legacy/evas/src/lib/Makefile.am index af75559b02..5ffe82bb28 100644 --- a/legacy/evas/src/lib/Makefile.am +++ b/legacy/evas/src/lib/Makefile.am @@ -111,7 +111,7 @@ $(ENGINE_CAIRO_X11_INC) libevas_la_SOURCES = \ main.c -libevas_la_LIBADD = $(LDFLAGS) \ +libevas_la_LIBADD = $LDFLAGS \ canvas/libevas_canvas.la \ data/libevas_data.la \ file/libevas_file.la \ diff --git a/legacy/evas/src/lib/canvas/Makefile.am b/legacy/evas/src/lib/canvas/Makefile.am index 5bcf95240f..dd1f72f386 100644 --- a/legacy/evas/src/lib/canvas/Makefile.am +++ b/legacy/evas/src/lib/canvas/Makefile.am @@ -37,5 +37,5 @@ evas_render.c \ evas_smart.c \ evas_stack.c -libevas_canvas_la_LIBADD = $(LDFLAGS) +libevas_canvas_la_LIBADD = $LDFLAGS libevas_canvas_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/data/Makefile.am b/legacy/evas/src/lib/data/Makefile.am index e47491c3a6..302af07b62 100644 --- a/legacy/evas/src/lib/data/Makefile.am +++ b/legacy/evas/src/lib/data/Makefile.am @@ -16,5 +16,5 @@ evas_hash.c \ evas_list.c \ evas_object_list.c -libevas_data_la_LIBADD = $(LDFLAGS) +libevas_data_la_LIBADD = $LDFLAGS libevas_data_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/buffer/Makefile.am b/legacy/evas/src/lib/engines/buffer/Makefile.am index 118ae40595..d545d43394 100644 --- a/legacy/evas/src/lib/engines/buffer/Makefile.am +++ b/legacy/evas/src/lib/engines/buffer/Makefile.am @@ -18,8 +18,7 @@ evas_engine.h \ evas_engine.c \ evas_outbuf.c -libevas_engine_buffer_la_LIBADD = \ -$(LDFLAGS) +libevas_engine_buffer_la_LIBADD = $LDFLAGS libevas_engine_buffer_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/cairo_common/Makefile.am b/legacy/evas/src/lib/engines/cairo_common/Makefile.am index fdd7dd2069..3a18c25c3c 100644 --- a/legacy/evas/src/lib/engines/cairo_common/Makefile.am +++ b/legacy/evas/src/lib/engines/cairo_common/Makefile.am @@ -17,8 +17,7 @@ libevas_engine_cairo_common_la_SOURCES = \ evas_cairo_private.h \ evas_cairo_main.c -libevas_engine_cairo_common_la_LIBADD = \ -@CAIRO_LIBS@ $(LDFLAGS) +libevas_engine_cairo_common_la_LIBADD = @CAIRO_LIBS@ $LDFLAGS libevas_engine_cairo_common_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/cairo_x11/Makefile.am b/legacy/evas/src/lib/engines/cairo_x11/Makefile.am index 652b853ad5..b021c91138 100644 --- a/legacy/evas/src/lib/engines/cairo_x11/Makefile.am +++ b/legacy/evas/src/lib/engines/cairo_x11/Makefile.am @@ -18,8 +18,7 @@ evas_engine.h \ evas_engine.c \ evas_x_main.c -libevas_engine_cairo_x11_la_LIBADD = \ -@x_libs@ @CAIRO_LIBS@ $(LDFLAGS) +libevas_engine_cairo_x11_la_LIBADD = @x_libs@ @CAIRO_LIBS@ $LDFLAGS libevas_engine_cairo_x11_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/common/Makefile.am b/legacy/evas/src/lib/engines/common/Makefile.am index b084850f96..de26d86719 100644 --- a/legacy/evas/src/lib/engines/common/Makefile.am +++ b/legacy/evas/src/lib/engines/common/Makefile.am @@ -57,8 +57,7 @@ evas_scale_smooth_scaler_downy.c \ evas_scale_smooth_scaler_noscale.c \ evas_scale_smooth_scaler_up.c -libevas_engine_common_la_LIBADD = \ -$(LDFLAGS) +libevas_engine_common_la_LIBADD = $LDFLAGS libevas_engine_common_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/directfb/Makefile.am b/legacy/evas/src/lib/engines/directfb/Makefile.am index c70a38b5a9..0202b1b29e 100644 --- a/legacy/evas/src/lib/engines/directfb/Makefile.am +++ b/legacy/evas/src/lib/engines/directfb/Makefile.am @@ -19,7 +19,7 @@ evas_engine_dfb_image_objects.c \ evas_engine_dfb_image_objects.h \ evas_engine_dfb.h -libevas_engine_directfb_la_LIBADD = $(LDFLAGS) @DIRECTFB_LIBS@ +libevas_engine_directfb_la_LIBADD = $LDFLAGS @DIRECTFB_LIBS@ libevas_engine_directfb_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/fb/Makefile.am b/legacy/evas/src/lib/engines/fb/Makefile.am index e6c97ec8ff..9099d0df34 100644 --- a/legacy/evas/src/lib/engines/fb/Makefile.am +++ b/legacy/evas/src/lib/engines/fb/Makefile.am @@ -21,8 +21,7 @@ evas_engine.c \ evas_fb_main.c \ evas_outbuf.c -libevas_engine_fb_la_LIBADD = \ -$(LDFLAGS) +libevas_engine_fb_la_LIBADD = $LDFLAGS libevas_engine_fb_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/gl_common/Makefile.am b/legacy/evas/src/lib/engines/gl_common/Makefile.am index cd4ccfec0a..81b94d4faf 100644 --- a/legacy/evas/src/lib/engines/gl_common/Makefile.am +++ b/legacy/evas/src/lib/engines/gl_common/Makefile.am @@ -25,8 +25,7 @@ evas_gl_polygon.c \ evas_gl_rectangle.c \ evas_gl_texture.c -libevas_engine_gl_common_la_LIBADD = \ -@gl_libs@ $(LDFLAGS) +libevas_engine_gl_common_la_LIBADD = @gl_libs@ $LDFLAGS libevas_engine_gl_common_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/gl_x11/Makefile.am b/legacy/evas/src/lib/engines/gl_x11/Makefile.am index 95eac4a07d..9abac2f319 100644 --- a/legacy/evas/src/lib/engines/gl_x11/Makefile.am +++ b/legacy/evas/src/lib/engines/gl_x11/Makefile.am @@ -18,8 +18,7 @@ evas_engine.h \ evas_engine.c \ evas_x_main.c -libevas_engine_gl_x11_la_LIBADD = \ -@x_libs@ @gl_libs@ $(LDFLAGS) +libevas_engine_gl_x11_la_LIBADD = @x_libs@ @gl_libs@ $LDFLAGS libevas_engine_gl_x11_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/software_qtopia/Makefile.am b/legacy/evas/src/lib/engines/software_qtopia/Makefile.am index c09169ff1c..98101f21b1 100644 --- a/legacy/evas/src/lib/engines/software_qtopia/Makefile.am +++ b/legacy/evas/src/lib/engines/software_qtopia/Makefile.am @@ -21,8 +21,7 @@ evas_engine.c \ evas_outbuf.c \ evas_qt_main.cpp -libevas_engine_software_qtopia_la_LIBADD = \ -@qt_libs@ $(LDFLAGS) +libevas_engine_software_qtopia_la_LIBADD = @qt_libs@ $LDFLAGS libevas_engine_software_qtopia_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/engines/software_x11/Makefile.am b/legacy/evas/src/lib/engines/software_x11/Makefile.am index e9a7976286..10c1bd40a6 100644 --- a/legacy/evas/src/lib/engines/software_x11/Makefile.am +++ b/legacy/evas/src/lib/engines/software_x11/Makefile.am @@ -21,8 +21,7 @@ evas_x_buffer.c \ evas_x_color.c \ evas_x_main.c -libevas_engine_software_x11_la_LIBADD = \ -@x_libs@ $(LDFLAGS) +libevas_engine_software_x11_la_LIBADD = @x_libs@ $LDFLAGS libevas_engine_software_x11_la_DEPENDENCIES = \ $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/file/Makefile.am b/legacy/evas/src/lib/file/Makefile.am index 55ce66081a..fc1a206e76 100644 --- a/legacy/evas/src/lib/file/Makefile.am +++ b/legacy/evas/src/lib/file/Makefile.am @@ -14,5 +14,5 @@ noinst_LTLIBRARIES = libevas_file.la libevas_file_la_SOURCES = \ evas_path.c -libevas_file_la_LIBADD = $(LDFLAGS) +libevas_file_la_LIBADD = $LDFLAGS libevas_file_la_DEPENDENCIES = $(top_builddir)/config.h diff --git a/legacy/evas/src/lib/imaging/Makefile.am b/legacy/evas/src/lib/imaging/Makefile.am index 8ac1826d91..f25474eedc 100644 --- a/legacy/evas/src/lib/imaging/Makefile.am +++ b/legacy/evas/src/lib/imaging/Makefile.am @@ -14,5 +14,5 @@ noinst_LTLIBRARIES = libevas_imaging.la libevas_imaging_la_SOURCES = \ evas_imaging.c -libevas_imaging_la_LIBADD = $(LDFLAGS) +libevas_imaging_la_LIBADD = $LDFLAGS libevas_imaging_la_DEPENDENCIES = $(top_builddir)/config.h