summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcaro <caro>2012-09-05 22:53:30 +0000
committercaro <caro@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>2012-09-05 22:53:30 +0000
commitb04298eae08272fae3fbf56f10ab227101dead8c (patch)
tree165bea6007a9d6cbb2368b83d87b61cd3dbe4fab
parent29b28638e0e90fea2e1e7ea91752571c3e589ce8 (diff)
downloadeobj-b04298eae08272fae3fbf56f10ab227101dead8c.tar.gz
eobj-b04298eae08272fae3fbf56f10ab227101dead8c.tar.bz2
eobj-b04298eae08272fae3fbf56f10ab227101dead8c.zip
Eobj: don't install benchmark and examples, request from Tom
git-svn-id: http://svn.enlightenment.org/svn/e/trunk/PROTO/eobj@76209 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33
-rw-r--r--configure.ac2
-rw-r--r--src/benchmarks/Makefile.am3
-rw-r--r--src/examples/eo_isa/Makefile.am22
-rw-r--r--src/examples/evas/Makefile.am24
-rw-r--r--src/examples/simple/Makefile.am22
5 files changed, 24 insertions, 49 deletions
diff --git a/configure.ac b/configure.ac
index c8bb6b7..1c463cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -145,7 +145,6 @@ AC_SUBST([requirements_pc_eo])
### Build and install examples
EFL_CHECK_BUILD_EXAMPLES([enable_build_examples="yes"], [enable_build_examples="no"])
-EFL_CHECK_INSTALL_EXAMPLES([enable_install_examples="yes"], [enable_install_examples="no"])
AC_CONFIG_FILES([
Makefile
@@ -179,7 +178,6 @@ echo
echo " Documentation........: ${build_doc}"
echo " Tests................: ${enable_tests} (Coverage: ${efl_enable_coverage})"
echo " Examples.............: ${enable_build_examples}"
-echo " Examples installed...: ${enable_install_examples}"
echo " Benchmark............: ${enable_benchmark}"
echo
echo "Compilation............: make (or gmake)"
diff --git a/src/benchmarks/Makefile.am b/src/benchmarks/Makefile.am
index 7095214..2ee6cbb 100644
--- a/src/benchmarks/Makefile.am
+++ b/src/benchmarks/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
if EFL_ENABLE_BENCHMARK
-bin_PROGRAMS = eo_bench
+noinst_PROGRAMS = eo_bench
eo_bench_SOURCES = \
class_simple.c \
@@ -17,6 +17,7 @@ class_simple.h \
eo_bench.c \
eo_bench.h \
eo_bench_eo_do.c
+
eo_bench_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
endif
diff --git a/src/examples/eo_isa/Makefile.am b/src/examples/eo_isa/Makefile.am
index 84a1678..eb95eba 100644
--- a/src/examples/eo_isa/Makefile.am
+++ b/src/examples/eo_isa/Makefile.am
@@ -1,8 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-exampledir = $(pkgdatadir)/examples
-
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib \
@@ -10,7 +8,13 @@ AM_CPPFLAGS = \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
-SRCS = \
+noinst_PROGRAMS =
+
+if EFL_BUILD_EXAMPLES
+
+noinst_PROGRAMS += eo_isa
+
+eo_isa_SOURCES = \
complex.c \
complex.h \
interface.c \
@@ -21,18 +25,6 @@ mixin.h \
simple.c \
simple.h
-example_PROGRAMS =
-
-if EFL_INSTALL_EXAMPLES
-filesdir = $(pkgdatadir)/examples
-files_DATA = $(SRCS)
-endif
-
-if EFL_BUILD_EXAMPLES
-
-example_PROGRAMS += eo_isa
-
-eo_isa_SOURCES = $(SRCS)
eo_isa_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
endif
diff --git a/src/examples/evas/Makefile.am b/src/examples/evas/Makefile.am
index ab4cd4b..2177853 100644
--- a/src/examples/evas/Makefile.am
+++ b/src/examples/evas/Makefile.am
@@ -1,15 +1,20 @@
MAINTAINERCLEANFILES = Makefile.in
-exampledir = $(pkgdatadir)/examples
-
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib \
-I$(top_builddir)/src/lib \
@EO_CFLAGS@
-SRCS = \
+noinst_PROGRAMS =
+
+if EFL_BUILD_EXAMPLES
+if EO_BUILD_EXAMPLE_EVAS
+
+noinst_PROGRAMS += evas
+
+evas_SOURCES = \
elw_box.c \
elw_box.h \
elw_boxedbutton.c \
@@ -22,19 +27,6 @@ evas_obj.c \
evas_obj.h \
test.c
-example_PROGRAMS =
-
-if EFL_INSTALL_EXAMPLES
-filesdir = $(pkgdatadir)/examples
-files_DATA = $(SRCS)
-endif
-
-if EFL_BUILD_EXAMPLES
-if EO_BUILD_EXAMPLE_EVAS
-
-example_PROGRAMS += evas
-
-evas_SOURCES = $(SRCS)
evas_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
endif
diff --git a/src/examples/simple/Makefile.am b/src/examples/simple/Makefile.am
index 959e440..fa21f0c 100644
--- a/src/examples/simple/Makefile.am
+++ b/src/examples/simple/Makefile.am
@@ -1,8 +1,6 @@
MAINTAINERCLEANFILES = Makefile.in
-exampledir = $(pkgdatadir)/examples
-
AM_CPPFLAGS = \
-I. \
-I$(top_srcdir)/src/lib \
@@ -10,7 +8,13 @@ AM_CPPFLAGS = \
@EFL_EO_BUILD@ \
@EO_CFLAGS@
-SRCS = \
+noinst_PROGRAMS =
+
+if EFL_BUILD_EXAMPLES
+
+noinst_PROGRAMS += simple
+
+simple_SOURCES = \
interface.c \
interface.h \
main.c \
@@ -19,18 +23,6 @@ mixin.h \
simple.c \
simple.h
-example_PROGRAMS =
-
-if EFL_INSTALL_EXAMPLES
-filesdir = $(pkgdatadir)/examples
-files_DATA = $(SRCS)
-endif
-
-if EFL_BUILD_EXAMPLES
-
-example_PROGRAMS += simple
-
-simple_SOURCES = $(SRCS)
simple_LDADD = $(top_builddir)/src/lib/libeo.la @EO_LIBS@
endif