buildie cleanies

19 years ago · 0e38160623
parent 49d92b0277
commit 0e38160623
19 changed files with 24 additions and 53 deletions
--- a/legacy/edje/src/bin/Makefile.am
+++ b/legacy/edje/src/bin/Makefile.am
@ -29,9 +29,6 @@ edje_main.h
 edje_LDADD = \
 $(top_builddir)/src/lib/libedje.la

-#edje_LDFLAGS = -static
-#edje_LDFLAGS =
-
 edje_CPPFLAGS = @edje_def@

 edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
@ -52,8 +49,6 @@ $(top_builddir)/src/lib/libedje.la \

 edje_cc_CPPFLAGS = @edje_def@

-#edje_cc_LDFLAGS =
-
 edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la


@ -69,8 +64,6 @@ $(top_builddir)/src/lib/libedje.la \

 edje_decc_CPPFLAGS = @edje_def@

-#edje_decc_LDFLAGS =
-
 edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la


@ -83,8 +76,6 @@ $(top_builddir)/src/lib/libedje.la

 edje_ls_CPPFLAGS = @edje_def@

-#edje_ls_LDFLAGS =
-
 edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la

 EXTRA_SCRIPTS = edje_recc
--- a/legacy/edje/src/lib/Makefile.am
+++ b/legacy/edje/src/lib/Makefile.am
@ -16,8 +16,8 @@ INCLUDES	     = \
@edje_def@

 lib_LTLIBRARIES      = \
-libedje.la \
-libedje_edit.la
+libedje.la
+#libedje_edit.la

 include_HEADERS      =  \
 Edje.h \
@ -41,14 +41,14 @@ edje_container.h \
 edje_message_queue.c \
 edje_private.h

-libedje_la_LIBADD       = $LDFLAGS -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@
+libedje_la_LIBADD       = -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ @fnmatch_libs@
 libedje_la_CPPFLAGS     =
 libedje_la_DEPENDENCIES = $(top_builddir)/config.h
-libedje_la_LDFLAGS      = -version-info 5:0:5
-
-libedje_edit_la_SOURCES  = \
-edje_edit.c
-
-libedje_edit_la_LIBADD       = $LDFLAGS -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ $(top_builddir)/src/lib/libedje.la
-libedje_edit_la_DEPENDENCIES = $(top_builddir)/config.h libedje.la
-libedje_edit_la_LDFLAGS      = -version-info 5:0:5
+libedje_la_LDFLAGS      = $(LDFLAGS) -version-info 5:0:5
+
+#libedje_edit_la_SOURCES  = \
+#edje_edit.c
+#
+#libedje_edit_la_LIBADD       = -lm @EVAS_LIBS@ @ECORE_LIBS@ @EET_LIBS@ @EMBRYO_LIBS@ $(top_builddir)/src/lib/libedje.la
+#libedje_edit_la_DEPENDENCIES = $(top_builddir)/config.h libedje.la
+#libedje_edit_la_LDFLAGS      = $(LDFLAGS) -version-info 5:0:5
--- a/legacy/eet/src/lib/Makefile.am
+++ b/legacy/eet/src/lib/Makefile.am
@ -18,6 +18,6 @@ eet_data.c \
 eet_memfile.c \
 Eet_private.h

-libeet_la_LIBADD       = $LDFLAGS -lz -ljpeg @fnmatch_libs@ @winsock_libs@
+libeet_la_LIBADD       = -lz -ljpeg @fnmatch_libs@ @winsock_libs@
 libeet_la_DEPENDENCIES = $(top_builddir)/config.h
-libeet_la_LDFLAGS      = -version-info 9:9:9
+libeet_la_LDFLAGS      = $(LDFLAGS) -version-info 9:9:9
--- a/legacy/embryo/src/lib/Makefile.am
+++ b/legacy/embryo/src/lib/Makefile.am
@ -24,6 +24,6 @@ embryo_str.c \
 embryo_time.c \
 embryo_private.h

-libembryo_la_LIBADD       = $LDFLAGS -lm @fnmatch_libs@
+libembryo_la_LIBADD       = -lm @fnmatch_libs@
 libembryo_la_DEPENDENCIES = $(top_builddir)/config.h
-libembryo_la_LDFLAGS      = -version-info 9:1:9
+libembryo_la_LDFLAGS      = $(LDFLAGS) -version-info 9:1:9
--- a/legacy/evas/src/bin/Makefile.am
+++ b/legacy/evas/src/bin/Makefile.am
@ -29,43 +29,36 @@ 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 =
 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 =
 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 =
 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 =
 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 =
 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 =
 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 =
 evas_buffer_test_CFLAGS = $(CFLAGS)
 evas_buffer_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la

@ -75,7 +68,6 @@ 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 =
 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
@ -83,13 +75,11 @@ 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 =
 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 =
 evas_cairo_x11_test_CFLAGS = $(CFLAGS) @x_cflags@ @CAIRO_CFLAGS@
 evas_cairo_x11_test_DEPENDENCIES = $(top_builddir)/src/lib/libevas.la

--- a/legacy/evas/src/lib/Makefile.am
+++ b/legacy/evas/src/lib/Makefile.am
@ -111,13 +111,13 @@ $(ENGINE_CAIRO_X11_INC)
 libevas_la_SOURCES  = \
 main.c

-libevas_la_LIBADD       = $LDFLAGS \
+libevas_la_LIBADD       = \
                          canvas/libevas_canvas.la \
 			  data/libevas_data.la \
 			  file/libevas_file.la \
 			  imaging/libevas_imaging.la \
-			  -lm \
 			  engines/common/libevas_engine_common.la \
+			  -lm \
 			  @freetype_libs@ \
 			  @png_libs@ @jpeg_libs@ @eet_libs@ @edb_libs@ \
 			  $(ENGINE_SOFTWARE_X11) \
@ -148,4 +148,4 @@ libevas_la_DEPENDENCIES = \
 			  $(ENGINE_CAIRO_COMMON) \
 			  $(ENGINE_CAIRO_X11)

-libevas_la_LDFLAGS      = -version-info 1:0:0
+libevas_la_LDFLAGS      = $(LDFLAGS) -version-info 1:0:0
--- a/legacy/evas/src/lib/canvas/Makefile.am
+++ b/legacy/evas/src/lib/canvas/Makefile.am
@ -37,5 +37,4 @@ evas_render.c \
 evas_smart.c \
 evas_stack.c

-libevas_canvas_la_LIBADD       = $LDFLAGS
 libevas_canvas_la_DEPENDENCIES = $(top_builddir)/config.h
--- a/legacy/evas/src/lib/data/Makefile.am
+++ b/legacy/evas/src/lib/data/Makefile.am
@ -16,5 +16,4 @@ evas_hash.c \
 evas_list.c \
 evas_object_list.c

-libevas_data_la_LIBADD       = $LDFLAGS
 libevas_data_la_DEPENDENCIES = $(top_builddir)/config.h
--- a/legacy/evas/src/lib/engines/buffer/Makefile.am
+++ b/legacy/evas/src/lib/engines/buffer/Makefile.am
@ -18,8 +18,6 @@ evas_engine.h \
 evas_engine.c \
 evas_outbuf.c

-libevas_engine_buffer_la_LIBADD       = $LDFLAGS
-
 libevas_engine_buffer_la_DEPENDENCIES = \
 $(top_builddir)/config.h

--- a/legacy/evas/src/lib/engines/cairo_common/Makefile.am
+++ b/legacy/evas/src/lib/engines/cairo_common/Makefile.am
@ -17,7 +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@

 libevas_engine_cairo_common_la_DEPENDENCIES = \
 $(top_builddir)/config.h
--- a/legacy/evas/src/lib/engines/common/Makefile.am
+++ b/legacy/evas/src/lib/engines/common/Makefile.am
@ -57,7 +57,5 @@ 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_DEPENDENCIES = \
 $(top_builddir)/config.h
--- 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       = @DIRECTFB_LIBS@

 libevas_engine_directfb_la_DEPENDENCIES = \
 $(top_builddir)/config.h
--- a/legacy/evas/src/lib/engines/fb/Makefile.am
+++ b/legacy/evas/src/lib/engines/fb/Makefile.am
@ -21,8 +21,6 @@ evas_engine.c \
 evas_fb_main.c \
 evas_outbuf.c

-libevas_engine_fb_la_LIBADD       = $LDFLAGS
-
 libevas_engine_fb_la_DEPENDENCIES = \
 $(top_builddir)/config.h

--- a/legacy/evas/src/lib/engines/gl_common/Makefile.am
+++ b/legacy/evas/src/lib/engines/gl_common/Makefile.am
@ -25,7 +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@

 libevas_engine_gl_common_la_DEPENDENCIES = \
 $(top_builddir)/config.h
--- a/legacy/evas/src/lib/engines/gl_x11/Makefile.am
+++ b/legacy/evas/src/lib/engines/gl_x11/Makefile.am
@ -18,7 +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@

 libevas_engine_gl_x11_la_DEPENDENCIES = \
 $(top_builddir)/config.h
--- a/legacy/evas/src/lib/engines/software_qtopia/Makefile.am
+++ b/legacy/evas/src/lib/engines/software_qtopia/Makefile.am
@ -21,7 +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@

 libevas_engine_software_qtopia_la_DEPENDENCIES = \
 $(top_builddir)/config.h
--- a/legacy/evas/src/lib/engines/software_x11/Makefile.am
+++ b/legacy/evas/src/lib/engines/software_x11/Makefile.am
@ -21,7 +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@

 libevas_engine_software_x11_la_DEPENDENCIES = \
 $(top_builddir)/config.h
--- a/legacy/evas/src/lib/file/Makefile.am
+++ b/legacy/evas/src/lib/file/Makefile.am
@ -14,5 +14,4 @@ noinst_LTLIBRARIES      = libevas_file.la
 libevas_file_la_SOURCES  = \
 evas_path.c

-libevas_file_la_LIBADD       = $LDFLAGS
 libevas_file_la_DEPENDENCIES = $(top_builddir)/config.h
--- a/legacy/evas/src/lib/imaging/Makefile.am
+++ b/legacy/evas/src/lib/imaging/Makefile.am
@ -14,5 +14,4 @@ noinst_LTLIBRARIES      = libevas_imaging.la
 libevas_imaging_la_SOURCES  = \
 evas_imaging.c

-libevas_imaging_la_LIBADD       = $LDFLAGS
 libevas_imaging_la_DEPENDENCIES = $(top_builddir)/config.h