autotools: Fixed 'make examples' and 'make examples-install'

It was broken in set-ups with ($(builddir) != $(srcdir)) && ($(builddir) !=
$(srcdir)/build)
This commit is contained in:
Savio Sena 2014-07-02 12:09:20 -03:00
parent 7d46c921cb
commit 073b666022
33 changed files with 44 additions and 42 deletions

View File

@ -107,7 +107,7 @@ lib_ecore_libecore_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@ECORE_CFLAGS@
lib_ecore_libecore_la_LIBADD = @ECORE_LIBS@ @EVIL_LIBS@
lib_ecore_libecore_la_DEPENDENCIES = @ECORE_INTERNAL_LIBS@

View File

@ -42,7 +42,7 @@ tests_ecore_audio_cxx_cxx_compile_test_CPPFLAGS = \
-I$(srcdir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/ecore_audio_cxx\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/ecore_audio_cxx\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/ecore_audio_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/ecore_audio_cxx\" \
@CHECK_CFLAGS@ @ECORE_CFLAGS@ @EINA_CFLAGS@ @EO_CFLAGS@ @ECORE_AUDIO_CFLAGS@ \
@ECORE_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EO_CXX_CFLAGS@ @ECORE_AUDIO_CXX_CFLAGS@

View File

@ -29,7 +29,7 @@ lib_ecore_evas_libecore_evas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_evas\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@ECORE_EVAS_CFLAGS@
lib_ecore_evas_libecore_evas_la_LIBADD = @ECORE_EVAS_LIBS@
lib_ecore_evas_libecore_evas_la_DEPENDENCIES = @ECORE_EVAS_INTERNAL_LIBS@

View File

@ -18,7 +18,7 @@ lib_ecore_imf_libecore_imf_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ecore_imf\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@ECORE_IMF_CFLAGS@
lib_ecore_imf_libecore_imf_la_LIBADD = @ECORE_IMF_LIBS@
lib_ecore_imf_libecore_imf_la_DEPENDENCIES = @ECORE_IMF_INTERNAL_LIBS@

View File

@ -27,8 +27,8 @@ EDJE_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/edje\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
@EDJE_CFLAGS@
installed_edjemainheadersdir = $(includedir)/edje-@VMAJ@

View File

@ -27,7 +27,7 @@ tests_eet_cxx_eet_cxx_suite_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eet_cxx\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eet_cxx\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eet_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eet_cxx\" \
@CHECK_CFLAGS@ @EET_CXX_CFLAGS@ @EINA_CXX_CFLAGS@ @EET_CFLAGS@ @EINA_CFLAGS@
tests_eet_cxx_eet_cxx_suite_LDADD = @CHECK_LIBS@ @USE_EET_LIBS@

View File

@ -49,7 +49,7 @@ lib_eeze_libeeze_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/eeze\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@EEZE_CFLAGS@
lib_eeze_libeeze_la_LIBADD = @EEZE_LIBS@
lib_eeze_libeeze_la_DEPENDENCIES = @EEZE_INTERNAL_LIBS@

View File

@ -10,7 +10,7 @@ EFREET_COMMON_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/efreet\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DDATA_DIR=\"$(datadir)\" \
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
@EFREET_CFLAGS@

View File

@ -276,7 +276,7 @@ tests/eina/eina_test_lock.c
tests_eina_eina_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina\" \
-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
@CHECK_CFLAGS@ \
@EINA_CFLAGS@
@ -292,7 +292,7 @@ check_LTLIBRARIES = tests/eina/module_dummy.la
tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
tests_eina_module_dummy_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina\" \
@CHECK_CFLAGS@ \
@EINA_CFLAGS@
tests_eina_module_dummy_la_LIBADD = @USE_EINA_LIBS@

View File

@ -52,7 +52,7 @@ tests/eina_cxx/eina_cxx_test_value.cc
tests_eina_cxx_eina_cxx_suite_CXXFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_WD=\"`pwd`\" \
-DTESTS_SRC_DIR=\"$(top_srcdir)/src/tests/eina_cxx\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/eina_cxx\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)/src/tests/eina_cxx\" \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eina_cxx\" \
@CHECK_CFLAGS@ \
@EINA_CXX_CFLAGS@

View File

@ -10,7 +10,7 @@ bin_elua_elua_SOURCES = \
bin_elua_elua_CPPFLAGS = -I$(top_builddir)/src/lib/efl @ELUA_CFLAGS@ \
-DLOCALE_DIR=\"@LOCALE_DIR@\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/elua\"
if HAVE_WIN32

View File

@ -50,7 +50,7 @@ bin_embryo_embryo_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
-DPACKAGE_SRC_DIR=\"`pwd`/$(top_srcdir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
@EMBRYO_CFLAGS@
if HAVE_WIN32

View File

@ -19,7 +19,7 @@ lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@EMOTION_CFLAGS@
lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
@ -180,7 +180,7 @@ tests_emotion_emotion_test_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@EDJE_CFLAGS@ \
@EMOTION_CFLAGS@

View File

@ -60,7 +60,7 @@ tests/eolian/eolian_suite.h
tests_eolian_eolian_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DTESTS_BUILD_DIR=\"$(top_builddir)/src/tests/eolian\" \
-DPACKAGE_DATA_DIR=\"$(top_srcdir)/src/tests/eolian\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@CHECK_CFLAGS@ \
@EOLIAN_CFLAGS@
TESTS += tests/eolian/eolian_suite

View File

@ -18,7 +18,7 @@ lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@ETHUMB_CFLAGS@
lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
@ -36,7 +36,7 @@ modules_ethumb_emotion_module_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@EMOTION_CFLAGS@ \
@ETHUMB_CFLAGS@
modules_ethumb_emotion_module_la_LIBADD = \

View File

@ -38,7 +38,7 @@ bin_ethumb_client_ethumbd_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb_client\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@ETHUMB_CLIENT_CFLAGS@
bin_ethumb_client_ethumbd_LDADD = $(USE_ETHUMB_CLIENT_BIN_LIBS)
bin_ethumb_client_ethumbd_DEPENDENCIES = @USE_ETHUMB_CLIENT_INTERNAL_LIBS@

View File

@ -390,7 +390,7 @@ lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
@EVAS_CFLAGS@ \
@VALGRIND_CFLAGS@ \
@ALTIVEC_CFLAGS@
@ -1318,7 +1318,7 @@ bin_evas_evas_cserve2_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DEVAS_MODULE_NO_ENGINES=1 \
-DEVAS_MODULE_NO_IMAGE_SAVERS=1 \
@EVAS_CFLAGS@

View File

@ -4,7 +4,7 @@ AM_CPPFLAGS = \
-I$(top_builddir)/src/lib/efl \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DCITYHASH_BENCH \
-DEINA_ENABLE_BENCH_E17 \
@EINA_CFLAGS@ \

View File

@ -5,7 +5,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/lib/eina \
-I$(top_builddir)/src/lib/eina \
-I$(top_srcdir)/src/modules/evas/engines/buffer \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DTESTS_SRC_DIR=\"$(abs_top_srcdir)/src/tests/evas\" \
@EVAS_CFLAGS@

View File

@ -288,7 +288,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/ecore/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ecore/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ecore/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -37,8 +37,8 @@ clean-local:
install-examples:
mkdir -p $(datadir)/ecore_avahi/examples
$(install_sh_DATA) -c ecore_avahi_browse_example.c $(datadir)/ecore_avahi/examples
$(install_sh_DATA) -c ecore_avahi_example.c $(datadir)/ecore_avahi/examples
$(install_sh_DATA) -c $(srcdir)/ecore_avahi_browse_example.c $(datadir)/ecore_avahi/examples
$(install_sh_DATA) -c $(srcdir)/ecore_avahi_example.c $(datadir)/ecore_avahi/examples
uninstall-local:
rm -f $(datadir)/ecore_avahi/examples/ecore_avahi_example.c

View File

@ -199,7 +199,8 @@ clean-local:
install-examples: $(EDJS)
mkdir -p $(datadir)/edje/examples
$(install_sh_DATA) -c $(SRCS) $(EDJS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DIST_EDCS) $(DATA_FILES) $(datadir)/edje/examples
cd $(builddir) && $(install_sh_DATA) -c $(EDJS) $(datadir)/edje/examples
uninstall-local:
for f in $(SRCS) $(DIST_EDCS) $(DATA_FILES); do \

View File

@ -51,7 +51,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/eet/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eet/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eet/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -147,7 +147,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/eina/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eina/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eina/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -29,7 +29,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/eina/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eina/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eina/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -50,7 +50,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/eio/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eio/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eio/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -84,7 +84,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/eldbus/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eldbus/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/eldbus/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -11,7 +11,7 @@ clean-local: ;
install-examples:
mkdir -p $(datadir)/elua/examples
$(install_sh_DATA) -c $(DATA_FILES) $(datadir)/elua/examples
cd $(srcdir) && $(install_sh_DATA) -c $(DATA_FILES) $(datadir)/elua/examples
uninstall-local:
for f in $(DATA_FILES); do \

View File

@ -50,7 +50,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/emotion/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/emotion/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/emotion/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -75,14 +75,15 @@ clean-local:
install-examples:
mkdir -p $(datadir)/eo/examples
$(install_sh_DATA) -c $(DATA_FILES) $(datadir)/eo/examples
mkdir -p $(datadir)/eo/examples/isa
$(install_sh_DATA) -c $(eo_isa_SOURCES) $(datadir)/eo/examples/isa
mkdir -p $(datadir)/eo/examples/simple
$(install_sh_DATA) -c $(eo_simple_SOURCES) $(datadir)/eo/examples/simple
cd $(srcdir); \
$(install_sh_DATA) -c $(DATA_FILES) $(datadir)/eo/examples; \
$(install_sh_DATA) -c $(eo_isa_SOURCES) $(datadir)/eo/examples/isa; \
$(install_sh_DATA) -c $(eo_simple_SOURCES) $(datadir)/eo/examples/simple;
if EO_BUILD_EXAMPLE_EVAS
mkdir -p $(datadir)/eo/examples/evas
$(install_sh_DATA) -c $(eo_evas_SOURCES) $(datadir)/eo/examples/evas
cd $(srcdir) && $(install_sh_DATA) -c $(eo_evas_SOURCES) $(datadir)/eo/examples/evas
endif
uninstall-local:

View File

@ -82,7 +82,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/ephysics/examples
$(install_sh_DATA) -c $(SRCS) $(datadir)/ephysics/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(datadir)/ephysics/examples
uninstall-local:
for f in $(SRCS) ; do \

View File

@ -51,7 +51,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/ethumb_client/examples
$(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ethumb_client/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(DATA_FILES) $(datadir)/ethumb_client/examples
uninstall-local:
for f in $(SRCS) $(DATA_FILES); do \

View File

@ -272,7 +272,7 @@ clean-local:
install-examples:
mkdir -p $(datadir)/evas/examples
$(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/evas/examples
cd $(srcdir) && $(install_sh_DATA) -c $(SRCS) $(EDCS) $(DATA_FILES) $(datadir)/evas/examples
uninstall-local:
for f in $(SRCS) $(EDCS) $(DATA_FILES); do \