forked from enlightenment/efl
Revert "build: fix examples dist based on various configure flags"
This reverts commit ded5b1e764
.
this broke build in some cases
This commit is contained in:
parent
63233680c7
commit
736c5a3063
12
Makefile.am
12
Makefile.am
|
@ -437,13 +437,7 @@ endif
|
||||||
EXTRA_DIST += $(systemdunits_DATA)
|
EXTRA_DIST += $(systemdunits_DATA)
|
||||||
|
|
||||||
|
|
||||||
PHONIES = doc benchmark
|
.PHONY: doc benchmark examples install-examples
|
||||||
|
|
||||||
if ALWAYS_BUILD_EXAMPLES
|
|
||||||
PHONIES += examples install-examples
|
|
||||||
endif
|
|
||||||
|
|
||||||
.PHONY: $(PHONIES)
|
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
|
|
||||||
|
@ -501,13 +495,13 @@ benchmark:
|
||||||
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
|
@cd benchmark && ../src/benchmarks/eo/eo_bench$(EXEEXT) `date +%F_%s`
|
||||||
|
|
||||||
# examples
|
# examples
|
||||||
if ALWAYS_BUILD_EXAMPLES
|
|
||||||
examples:
|
examples:
|
||||||
@$(MAKE) $(AM_MAKEFLAGS) -C src examples
|
@$(MAKE) $(AM_MAKEFLAGS) -C src examples
|
||||||
|
|
||||||
install-examples:
|
install-examples:
|
||||||
@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
|
@$(MAKE) $(AM_MAKEFLAGS) -C src install-examples
|
||||||
endif
|
|
||||||
pkgbuild::
|
pkgbuild::
|
||||||
@echo "making arch packages"
|
@echo "making arch packages"
|
||||||
makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
|
makepkg -f -p $(top_builddir)/pkgbuild/PKGBUILD
|
||||||
|
|
44
configure.ac
44
configure.ac
|
@ -5621,32 +5621,6 @@ case "$host_os" in
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
if test "x$want_always_build_examples" = "xyes" ; then
|
|
||||||
if test "x$have_cxx11" = "xyes" ; then
|
|
||||||
cxx_examples="src/examples/eina_cxx/Makefile
|
|
||||||
src/examples/eolian_cxx/Makefile"
|
|
||||||
fi
|
|
||||||
if test "x$have_elua" = "xyes" ; then
|
|
||||||
elua_examples="src/examples/elua/Makefile"
|
|
||||||
fi
|
|
||||||
examples_build="src/examples/eina/Makefile
|
|
||||||
src/examples/eet/Makefile
|
|
||||||
src/examples/evas/Makefile
|
|
||||||
src/examples/ecore/Makefile
|
|
||||||
src/examples/ecore_avahi/Makefile
|
|
||||||
src/examples/eio/Makefile
|
|
||||||
src/examples/eldbus/Makefile
|
|
||||||
src/examples/ephysics/Makefile
|
|
||||||
src/examples/edje/Makefile
|
|
||||||
src/examples/emotion/Makefile
|
|
||||||
src/examples/emile/Makefile
|
|
||||||
src/examples/ethumb_client/Makefile
|
|
||||||
src/examples/elocation/Makefile
|
|
||||||
src/examples/elementary/Makefile
|
|
||||||
$elua_examples
|
|
||||||
$cxx_examples"
|
|
||||||
fi
|
|
||||||
|
|
||||||
AC_CONFIG_FILES([
|
AC_CONFIG_FILES([
|
||||||
Makefile
|
Makefile
|
||||||
data/Makefile
|
data/Makefile
|
||||||
|
@ -5665,7 +5639,23 @@ src/Makefile
|
||||||
src/benchmarks/eina/Makefile
|
src/benchmarks/eina/Makefile
|
||||||
src/benchmarks/eo/Makefile
|
src/benchmarks/eo/Makefile
|
||||||
src/benchmarks/evas/Makefile
|
src/benchmarks/evas/Makefile
|
||||||
$examples_build
|
src/examples/eina/Makefile
|
||||||
|
src/examples/eina_cxx/Makefile
|
||||||
|
src/examples/eet/Makefile
|
||||||
|
src/examples/evas/Makefile
|
||||||
|
src/examples/ecore/Makefile
|
||||||
|
src/examples/ecore_avahi/Makefile
|
||||||
|
src/examples/eio/Makefile
|
||||||
|
src/examples/eldbus/Makefile
|
||||||
|
src/examples/ephysics/Makefile
|
||||||
|
src/examples/edje/Makefile
|
||||||
|
src/examples/emotion/Makefile
|
||||||
|
src/examples/emile/Makefile
|
||||||
|
src/examples/ethumb_client/Makefile
|
||||||
|
src/examples/elua/Makefile
|
||||||
|
src/examples/eolian_cxx/Makefile
|
||||||
|
src/examples/elocation/Makefile
|
||||||
|
src/examples/elementary/Makefile
|
||||||
src/lib/eina/eina_config.h
|
src/lib/eina/eina_config.h
|
||||||
src/lib/efl/Efl_Config.h
|
src/lib/efl/Efl_Config.h
|
||||||
src/lib/elementary/Elementary_Options.h
|
src/lib/elementary/Elementary_Options.h
|
||||||
|
|
|
@ -97,12 +97,7 @@ endif
|
||||||
include Makefile_Eolian_Js.am
|
include Makefile_Eolian_Js.am
|
||||||
include Makefile_Efl_Js.am
|
include Makefile_Efl_Js.am
|
||||||
|
|
||||||
PHONIES = benchmark
|
.PHONY: benchmark examples
|
||||||
if ALWAYS_BUILD_EXAMPLES
|
|
||||||
PHONIES += examples
|
|
||||||
endif
|
|
||||||
|
|
||||||
.PHONY: $(PHONIES)
|
|
||||||
|
|
||||||
BENCHMARK_SUBDIRS = \
|
BENCHMARK_SUBDIRS = \
|
||||||
benchmarks/eina \
|
benchmarks/eina \
|
||||||
|
@ -155,7 +150,6 @@ check-build: all
|
||||||
@$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
|
@$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if ALWAYS_BUILD_EXAMPLES
|
|
||||||
examples: all
|
examples: all
|
||||||
@for d in $(EXAMPLES_SUBDIRS); do \
|
@for d in $(EXAMPLES_SUBDIRS); do \
|
||||||
echo "Making examples in $$d"; \
|
echo "Making examples in $$d"; \
|
||||||
|
@ -167,7 +161,6 @@ install-examples:
|
||||||
echo "Making install-examples in $$d"; \
|
echo "Making install-examples in $$d"; \
|
||||||
$(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
|
$(MAKE) $(AM_MAKEFLAGS) -C $$d install-examples || exit 1; \
|
||||||
done
|
done
|
||||||
endif
|
|
||||||
|
|
||||||
dist-hook:
|
dist-hook:
|
||||||
@mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data
|
@mkdir -p $(distdir)/tests/elua/data/apps $(distdir)/tests/eolian/data
|
||||||
|
|
Loading…
Reference in New Issue