From d7bd8941c9bd3523d3fbf7d40843f1f004af9098 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Andre Date: Mon, 4 Nov 2013 17:19:43 +0900 Subject: [PATCH] Quicklaunch: Remove extra build code for elm_test Now that we know we can just compile PIE programs and run them with quicklaunch, let's simplify the build logic. I'm pretty sure it even gives a nice boost in the build process :) --- legacy/elementary/src/bin/Makefile.am | 48 +++++---------------------- 1 file changed, 8 insertions(+), 40 deletions(-) diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am index 9069050162..959ad07fa6 100644 --- a/legacy/elementary/src/bin/Makefile.am +++ b/legacy/elementary/src/bin/Makefile.am @@ -37,7 +37,7 @@ bin_PROGRAMS = \ @ELM_PREFS_CC_PRG@ if BUILD_QUICKLAUNCH -bin_PROGRAMS += elementary_quicklaunch elementary_run elementary_testql +bin_PROGRAMS += elementary_quicklaunch elementary_run endif EXTRA_PROGRAMS = elementary_test elementary_config elementary_codegen elm_prefs_cc @@ -157,8 +157,14 @@ elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \ @EIO_LIBS@ \ @ELEMENTARY_WEB_LIBS@ \ @my_libs@ +elementary_test_CFLAGS = elementary_test_LDFLAGS = +if BUILD_QUICKLAUNCH +elementary_test_CFLAGS += -fpie +elementary_test_LDFLAGS += -pie -rdynamic +endif + elementary_config_SOURCES = \ config.c @@ -228,45 +234,7 @@ elementary_run_SOURCES = run.c elementary_run_LDADD = elementary_run_LDFLAGS = endif - -## This is how to build a quicklanch capable app -# build the shared lib version - libtool produces a .a and .la file as well -# as a .so - these get put in libdir ($PREFIX/lib) as elementary_testql.so -# etc. - this is where elementary will expect to find the .so's for -# quicklaunch apps. -elementary_testqldir = $(libdir) -elementary_testql_LTLIBRARIES = elementary_testql.la -elementary_testql_la_SOURCES = $(elementary_test_SOURCES) -elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \ - @ELEMENTARY_WAYLAND_LIBS@ \ - @ELEMENTARY_EWEATHER_LIBS@ \ - @ELEMENTARY_ELDBUS_LIBS@ \ - @ELEMENTARY_EFREET_LIBS@ \ - @ELEMENTARY_ELOCATION_LIBS@ \ - @ELEMENTARY_EMAP_LIBS@ \ - @ELEMENTARY_LIBS@ \ - @EIO_LIBS@ \ - @ELEMENTARY_WEB_LIBS@ \ - @my_libs@ - -elementary_testql_la_CFLAGS = -elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined -elementary_testql_SOURCES = $(elementary_test_SOURCES) -elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \ - @ELEMENTARY_WAYLAND_LIBS@ \ - @ELEMENTARY_EWEATHER_LIBS@ \ - @ELEMENTARY_ELDBUS_LIBS@ \ - @ELEMENTARY_EFREET_LIBS@ \ - @ELEMENTARY_ELOCATION_LIBS@ \ - @ELEMENTARY_EMAP_LIBS@ \ - @ELEMENTARY_LIBS@ \ - @EIO_LIBS@ \ - @ELEMENTARY_WEB_LIBS@ \ - @my_libs@ - -elementary_testql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1 -elementary_testql_LDFLAGS = endif EXTRA_DIST = \ -test_factory.c \ No newline at end of file +test_factory.c