From 493f9a9ff9ba1a37664fa68be35ae31c15ecaba7 Mon Sep 17 00:00:00 2001 From: Gustavo Sverzut Barbieri Date: Sun, 30 Dec 2012 22:15:29 +0000 Subject: [PATCH] efl: unify LDFLAGS for LTLIBRARIES SVN revision: 81911 --- configure.ac | 7 +++---- src/Makefile_EDBus.am | 2 +- src/Makefile_Ecore.am | 2 +- src/Makefile_Ecore_Audio.am | 2 +- src/Makefile_Ecore_Cocoa.am | 2 +- src/Makefile_Ecore_Con.am | 3 +-- src/Makefile_Ecore_Evas.am | 2 +- src/Makefile_Ecore_FB.am | 2 +- src/Makefile_Ecore_File.am | 8 +++----- src/Makefile_Ecore_Imf.am | 4 ++-- src/Makefile_Ecore_Input.am | 4 ++-- src/Makefile_Ecore_Ipc.am | 2 +- src/Makefile_Ecore_Psl1ght.am | 2 +- src/Makefile_Ecore_SDL.am | 2 +- src/Makefile_Ecore_Wayland.am | 2 +- src/Makefile_Ecore_Win32.am | 2 +- src/Makefile_Ecore_WinCE.am | 2 +- src/Makefile_Ecore_X.am | 2 +- src/Makefile_Eet.am | 2 +- src/Makefile_Efreet.am | 8 +++----- src/Makefile_Eina.am | 3 +-- src/Makefile_Eio.am | 2 +- src/Makefile_Embryo.am | 2 +- src/Makefile_Eo.am | 3 +-- src/Makefile_Escape.am | 2 +- src/Makefile_Evas.am | 2 +- src/Makefile_Evil.am | 5 ++--- 27 files changed, 36 insertions(+), 45 deletions(-) diff --git a/configure.ac b/configure.ac index b666ace..3c41884 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,7 @@ m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep - ##-- When released, remove the dnl on the below line dnl m4_undefine([v_rev]) +m4_define([v_rel], []) ##-- When doing snapshots - change soname. remove dnl on below line dnl m4_define([relname], [ver-pre-svn-07]) dnl m4_define([v_rel], [-release relname]) @@ -223,10 +224,8 @@ if test "x${have_windows}" = "xyes" ; then lt_cv_deplibs_check_method='pass_all' fi LT_INIT([win32-dll disable-static disable-fast-install pic-only]) -version_info="lt_cur:lt_rev:lt_age" -AC_SUBST([version_info]) -release_info="v_rel" -AC_SUBST([release_info]) +EFL_LTLIBRARY_FLAGS="-no-undefined -version-info lt_cur:lt_rev:lt_age v_rel" +AC_SUBST(EFL_LTLIBRARY_FLAGS) ### gettext diff --git a/src/Makefile_EDBus.am b/src/Makefile_EDBus.am index bf546f8..395a3ca 100644 --- a/src/Makefile_EDBus.am +++ b/src/Makefile_EDBus.am @@ -51,7 +51,7 @@ lib/ecore/libecore.la \ @EDBUS_LIBS@ \ @EFL_COV_LIBS@ -lib_edbus_libedbus2_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_edbus_libedbus2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Binary diff --git a/src/Makefile_Ecore.am b/src/Makefile_Ecore.am index 703bf91..365c9fd 100644 --- a/src/Makefile_Ecore.am +++ b/src/Makefile_Ecore.am @@ -67,7 +67,7 @@ lib/eina/libeina.la \ @ECORE_LIBS@ \ @EFL_COV_LIBS@ -lib_ecore_libecore_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_libecore_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Unit tests diff --git a/src/Makefile_Ecore_Audio.am b/src/Makefile_Ecore_Audio.am index 76db4a2..67c8054 100644 --- a/src/Makefile_Ecore_Audio.am +++ b/src/Makefile_Ecore_Audio.am @@ -35,4 +35,4 @@ lib/eina/libeina.la \ @ECORE_AUDIO_LIBS@ \ @EFL_COV_LIBS@ -lib_ecore_audio_libecore_audio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_audio_libecore_audio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Cocoa.am b/src/Makefile_Ecore_Cocoa.am index a897dbb..ff5e0e8 100644 --- a/src/Makefile_Ecore_Cocoa.am +++ b/src/Makefile_Ecore_Cocoa.am @@ -30,4 +30,4 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @ECORE_COCOA_LIBS@ -lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_cocoa_libecore_cocoa_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Con.am b/src/Makefile_Ecore_Con.am index 61b535e..584e932 100644 --- a/src/Makefile_Ecore_Con.am +++ b/src/Makefile_Ecore_Con.am @@ -54,5 +54,4 @@ lib/eina/libeina.la \ @USE_EVIL_LIBS@ lib_ecore_con_libecore_con_la_LIBADD += @ECORE_CON_LIBS@ @EFL_COV_LIBS@ - -lib_ecore_con_libecore_con_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_con_libecore_con_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Evas.am b/src/Makefile_Ecore_Evas.am index 0e0aabb..658c45e 100644 --- a/src/Makefile_Ecore_Evas.am +++ b/src/Makefile_Ecore_Evas.am @@ -45,7 +45,7 @@ lib/eina/libeina.la \ @EFL_COV_LIBS@ lib_ecore_evas_libecore_evas_la_LIBADD += @EFL_COV_LIBS@ -lib_ecore_evas_libecore_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_evas_libecore_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # Engines diff --git a/src/Makefile_Ecore_FB.am b/src/Makefile_Ecore_FB.am index cac0968..326f97e 100644 --- a/src/Makefile_Ecore_FB.am +++ b/src/Makefile_Ecore_FB.am @@ -36,4 +36,4 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @ECORE_FB_LIBS@ -lib_ecore_fb_libecore_fb_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_fb_libecore_fb_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_File.am b/src/Makefile_Ecore_File.am index 73a047c..7c9ffa7 100644 --- a/src/Makefile_Ecore_File.am +++ b/src/Makefile_Ecore_File.am @@ -42,8 +42,6 @@ lib_ecore_file_libecore_file_la_LIBADD = \ lib/ecore_con/libecore_con.la \ lib/ecore/libecore.la \ lib/eo/libeo.la \ -lib/eina/libeina.la - -lib_ecore_file_libecore_file_la_LIBADD += @EFL_COV_LIBS@ - -lib_ecore_file_libecore_file_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib/eina/libeina.la \ +@EFL_COV_LIBS@ +lib_ecore_file_libecore_file_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Imf.am b/src/Makefile_Ecore_Imf.am index f2bcd74..9aa7529 100644 --- a/src/Makefile_Ecore_Imf.am +++ b/src/Makefile_Ecore_Imf.am @@ -31,7 +31,7 @@ lib/ecore/libecore.la \ lib/eo/libeo.la \ lib/eina/libeina.la -lib_ecore_imf_libecore_imf_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_imf_libecore_imf_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ installed_ecoreimfevasmainheadersdir = $(includedir)/ecore-@VMAJ@ dist_installed_ecoreimfevasmainheaders_DATA = \ @@ -59,7 +59,7 @@ lib/evas/libevas.la \ lib/eo/libeo.la \ lib/eina/libeina.la -lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_imf_libecore_imf_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Modules diff --git a/src/Makefile_Ecore_Input.am b/src/Makefile_Ecore_Input.am index ab6d491..80bbffa 100644 --- a/src/Makefile_Ecore_Input.am +++ b/src/Makefile_Ecore_Input.am @@ -32,7 +32,7 @@ lib/eina/libeina.la \ @EFL_COV_LIBS@ lib_ecore_input_libecore_input_la_LIBADD += @EFL_COV_LIBS@ -lib_ecore_input_libecore_input_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_input_libecore_input_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ installed_ecoreinputevasmainheadersdir = $(includedir)/ecore-@VMAJ@ dist_installed_ecoreinputevasmainheaders_DATA = \ @@ -62,4 +62,4 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @EFL_COV_LIBS@ -lib_ecore_input_libecore_input_evas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_input_libecore_input_evas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Ipc.am b/src/Makefile_Ecore_Ipc.am index 250c1b5..8fc822a 100644 --- a/src/Makefile_Ecore_Ipc.am +++ b/src/Makefile_Ecore_Ipc.am @@ -31,4 +31,4 @@ lib/eina/libeina.la \ @EFL_COV_LIBS@ \ @ECORE_IPC_LIBS@ -lib_ecore_ipc_libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_ipc_libecore_ipc_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Psl1ght.am b/src/Makefile_Ecore_Psl1ght.am index 71b4378..f41c429 100644 --- a/src/Makefile_Ecore_Psl1ght.am +++ b/src/Makefile_Ecore_Psl1ght.am @@ -31,4 +31,4 @@ lib/ecore/libecore.la \ lib/eo/libeo.la \ lib/eina/libeina.la -lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_psl1ght_libecore_psl1ght_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_SDL.am b/src/Makefile_Ecore_SDL.am index 11406f0..ea10516 100644 --- a/src/Makefile_Ecore_SDL.am +++ b/src/Makefile_Ecore_SDL.am @@ -31,4 +31,4 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @ECORE_SDL_LIBS@ -lib_ecore_sdl_libecore_sdl_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_sdl_libecore_sdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Wayland.am b/src/Makefile_Ecore_Wayland.am index d4a111f..1fc16f2 100644 --- a/src/Makefile_Ecore_Wayland.am +++ b/src/Makefile_Ecore_Wayland.am @@ -33,4 +33,4 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @ECORE_WAYLAND_LIBS@ -lib_ecore_wayland_libecore_wayland_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_wayland_libecore_wayland_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_Win32.am b/src/Makefile_Ecore_Win32.am index c54e8be..4fc87d7 100644 --- a/src/Makefile_Ecore_Win32.am +++ b/src/Makefile_Ecore_Win32.am @@ -43,4 +43,4 @@ lib/eina/libeina.la \ lib/evil/libevil.la \ @ECORE_WIN32_LIBS@ -lib_ecore_win32_libecore_win32_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_win32_libecore_win32_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_WinCE.am b/src/Makefile_Ecore_WinCE.am index 9ab16b5..62f5058 100644 --- a/src/Makefile_Ecore_WinCE.am +++ b/src/Makefile_Ecore_WinCE.am @@ -33,4 +33,4 @@ lib/eina/libeina.la \ lib/evil/libevil.la \ @ECORE_WINCE_LIBS@ -lib_ecore_wince_libecore_wince_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_wince_libecore_wince_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Ecore_X.am b/src/Makefile_Ecore_X.am index 36248fb..eeb70b1 100644 --- a/src/Makefile_Ecore_X.am +++ b/src/Makefile_Ecore_X.am @@ -115,7 +115,7 @@ lib/eo/libeo.la \ lib/eina/libeina.la \ @ECORE_X_LIBS@ -lib_ecore_x_libecore_x_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_ecore_x_libecore_x_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ MAINTAINERCLEANFILES += \ $(top_builddir)/src/lib/ecore_x/ecore_x_version.h diff --git a/src/Makefile_Eet.am b/src/Makefile_Eet.am index 647f1ea..b860da7 100644 --- a/src/Makefile_Eet.am +++ b/src/Makefile_Eet.am @@ -42,7 +42,7 @@ lib/eina/libeina.la \ @EET_LIBS@ \ @EFL_COV_LIBS@ -lib_eet_libeet_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_eet_libeet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ EXTRA_DIST += static_libs/lz4/README diff --git a/src/Makefile_Efreet.am b/src/Makefile_Efreet.am index dd7bca9..ed82767 100644 --- a/src/Makefile_Efreet.am +++ b/src/Makefile_Efreet.am @@ -43,8 +43,6 @@ lib/edbus/libedbus2.la \ EFREET_COMMON_USER_LIBADD = $(EFREET_COMMON_LIBADD) lib/efreet/libefreet.la -EFREET_COMMON_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ - installed_efreetmainheadersdir = $(includedir)/efreet-@VMAJ@ dist_installed_efreetmainheaders_DATA = \ lib/efreet/Efreet.h \ @@ -78,19 +76,19 @@ lib/efreet/efreet_alloca.h lib_efreet_libefreet_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) lib_efreet_libefreet_la_LIBADD = $(EFREET_COMMON_LIBADD) -lib_efreet_libefreet_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS) +lib_efreet_libefreet_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # libefreet_mime.la lib_efreet_libefreet_mime_la_SOURCES = lib/efreet/efreet_mime.c lib_efreet_libefreet_mime_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) lib_efreet_libefreet_mime_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) -lib_efreet_libefreet_mime_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS) +lib_efreet_libefreet_mime_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # libefreet_trash.la lib_efreet_libefreet_trash_la_SOURCES = lib/efreet/efreet_trash.c lib_efreet_libefreet_trash_la_CPPFLAGS = $(EFREET_COMMON_CPPFLAGS) lib_efreet_libefreet_trash_la_LIBADD = $(EFREET_COMMON_USER_LIBADD) -lib_efreet_libefreet_trash_la_LDFLAGS = $(EFREET_COMMON_LDFLAGS) +lib_efreet_libefreet_trash_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Binary diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am index 654c749..d457f18 100644 --- a/src/Makefile_Eina.am +++ b/src/Makefile_Eina.am @@ -217,8 +217,7 @@ lib_eina_libeina_la_CPPFLAGS = \ @USE_EVIL_CFLAGS@ lib_eina_libeina_la_LIBADD = @EINA_LIBS@ @EFL_COV_LIBS@ @USE_EVIL_LIBS@ @DL_LIBS@ - -lib_eina_libeina_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ +lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Script diff --git a/src/Makefile_Eio.am b/src/Makefile_Eio.am index 6c3058c..43cfe1c 100644 --- a/src/Makefile_Eio.am +++ b/src/Makefile_Eio.am @@ -45,4 +45,4 @@ lib/ecore/libecore.la \ @EIO_LIBS@ \ @EFL_COV_LIBS@ -lib_eio_libeio_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_eio_libeio_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Embryo.am b/src/Makefile_Embryo.am index fc11904..d8452f7 100644 --- a/src/Makefile_Embryo.am +++ b/src/Makefile_Embryo.am @@ -32,7 +32,7 @@ lib/eina/libeina.la \ @EMBRYO_LIBS@ \ @USE_EVIL_LIBS@ -lib_embryo_libembryo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_embryo_libembryo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Binary diff --git a/src/Makefile_Eo.am b/src/Makefile_Eo.am index 54fef7e6..aa0fad6 100644 --- a/src/Makefile_Eo.am +++ b/src/Makefile_Eo.am @@ -23,8 +23,7 @@ lib_eo_libeo_la_CPPFLAGS = \ @USE_EVIL_CFLAGS@ lib_eo_libeo_la_LIBADD = lib/eina/libeina.la @EO_LIBS@ @EFL_COV_LIBS@ - -lib_eo_libeo_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_eo_libeo_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ ### Unit tests diff --git a/src/Makefile_Escape.am b/src/Makefile_Escape.am index 4b8ffb2..2b0db2a 100644 --- a/src/Makefile_Escape.am +++ b/src/Makefile_Escape.am @@ -21,4 +21,4 @@ lib/escape/escape_unistd.c lib_escape_libescape_la_CPPFLAGS = \ -I$(top_srcdir)/src/lib/escape lib_escape_libescape_la_LIBADD = @ESCAPE_LIBS@ -lib_escape_libescape_la_LDFLAGS = -no-undefined -version-info @version_info@ +lib_escape_libescape_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ diff --git a/src/Makefile_Evas.am b/src/Makefile_Evas.am index 56696d3..02d8a39 100644 --- a/src/Makefile_Evas.am +++ b/src/Makefile_Evas.am @@ -234,7 +234,7 @@ lib/eo/libeo.la \ @EVAS_LIBS@ \ @EFL_COV_LIBS@ -lib_evas_libevas_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@ +lib_evas_libevas_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ # Linebreak diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am index a9c4d54..273d42b 100644 --- a/src/Makefile_Evil.am +++ b/src/Makefile_Evil.am @@ -100,7 +100,7 @@ lib_evil_libevil_la_CPPFLAGS = \ lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ lib_evil_libevil_la_LIBADD = @EVIL_LIBS@ -lib_evil_libevil_la_LDFLAGS = -no-undefined -version-info @version_info@ +lib_evil_libevil_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ if HAVE_WINCE lib_evil_libevil_la_LINK = $(LINK) $(lib_evil_libevil_la_LDFLAGS) @@ -117,8 +117,7 @@ lib_evil_libdl_la_CPPFLAGS = \ lib_evil_libdl_la_CFLAGS = @EVIL_CFLAGS@ lib_evil_libdl_la_LIBADD = lib/evil/libevil.la @EVIL_DLFCN_LIBS@ - -lib_evil_libdl_la_LDFLAGS = -no-undefined -version-info @version_info@ +lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ EXTRA_DIST += lib/evil/gdtoa/README lib/evil/gdtoa/README.mingw -- 2.7.4