summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-10-23 05:43:57 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-10-23 05:43:57 +0000
commit77d90bd45e3d463bf01c054e2431002d57fe9834 (patch)
treecfbbd5352f1aa9831c17b2b8f70b671d62b1f027
parent4aae3528c0fea8fbf390370c8085e501cf2de4ed (diff)
merge: pass directly to the preprocessor the Windows macro instead of using autotools
SVN revision: 78350
-rw-r--r--configure.ac14
-rw-r--r--src/benchmarks/eo/Makefile.am1
-rw-r--r--src/examples/eo/Makefile.am1
-rw-r--r--src/lib/eet/Makefile.am4
-rw-r--r--src/lib/eina/Makefile.am2
-rw-r--r--src/lib/eo/Makefile.am2
-rw-r--r--src/modules/eina/mp/chained_pool/Makefile.am2
-rw-r--r--src/modules/eina/mp/one_big/Makefile.am2
-rw-r--r--src/modules/eina/mp/pass_through/Makefile.am2
-rw-r--r--src/tests/eina/Makefile.am2
-rw-r--r--src/tests/eo/Makefile.am1
11 files changed, 8 insertions, 25 deletions
diff --git a/configure.ac b/configure.ac
index 1532bec9e7..c4cd415106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -396,14 +396,11 @@ AC_DEFINE_IF([EINA_STRINGSHARE_USAGE],
396 396
397# Evil library for compilation on Windows 397# Evil library for compilation on Windows
398 398
399EFL_EINA_BUILD=""
400case "$host_os" in 399case "$host_os" in
401 mingw*) 400 mingw*)
402 requirements_pc_eina="${requirements_pc_eina} evil" 401 requirements_pc_eina="${requirements_pc_eina} evil"
403 EFL_EINA_BUILD="-DEFL_EINA_BUILD"
404 ;; 402 ;;
405esac 403esac
406AC_SUBST([EFL_EINA_BUILD])
407 404
408# Escape library for compilation on Playstation 3 405# Escape library for compilation on Playstation 3
409 406
@@ -572,14 +569,11 @@ esac
572 569
573# Evil library for compilation on Windows 570# Evil library for compilation on Windows
574 571
575EFL_EET_BUILD=""
576case "$host_os" in 572case "$host_os" in
577 mingw*) 573 mingw*)
578 requirements_pc_eet="evil ${requirements_pc_eet}" 574 requirements_pc_eet="evil ${requirements_pc_eet}"
579 EFL_EET_BUILD="-DEFL_EET_BUILD"
580 ;; 575 ;;
581esac 576esac
582AC_SUBST(EFL_EET_BUILD)
583 577
584## Secure layer 578## Secure layer
585 579
@@ -740,14 +734,6 @@ AM_CONDITIONAL([EO_BUILD_EXAMPLE_EVAS], [test "x${have_elm}" = "xyes"])
740 734
741### Checks for compiler characteristics 735### Checks for compiler characteristics
742 736
743EFL_EO_BUILD=""
744case "$host_os" in
745 mingw*)
746 EFL_EO_BUILD="-DEFL_EO_BUILD"
747 ;;
748esac
749AC_SUBST([EFL_EO_BUILD])
750
751### Checks for linker characteristics 737### Checks for linker characteristics
752 738
753### Checks for library functions 739### Checks for library functions
diff --git a/src/benchmarks/eo/Makefile.am b/src/benchmarks/eo/Makefile.am
index 737fcc369a..052b445f33 100644
--- a/src/benchmarks/eo/Makefile.am
+++ b/src/benchmarks/eo/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib/eo \ 6-I$(top_srcdir)/src/lib/eo \
7-I$(top_builddir)/src/lib/eina \ 7-I$(top_builddir)/src/lib/eina \
8-I$(top_builddir)/src/lib/eo \ 8-I$(top_builddir)/src/lib/eo \
9@EFL_EO_BUILD@ \
10@EO_CFLAGS@ 9@EO_CFLAGS@
11 10
12EXTRA_PROGRAMS = eo_bench 11EXTRA_PROGRAMS = eo_bench
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index 2a2072e451..924138c41e 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
6-I$(top_srcdir)/src/lib/eo \ 6-I$(top_srcdir)/src/lib/eo \
7-I$(top_builddir)/src/lib/eina \ 7-I$(top_builddir)/src/lib/eina \
8-I$(top_builddir)/src/lib/eo \ 8-I$(top_builddir)/src/lib/eo \
9@EFL_EO_BUILD@ \
10@EO_CFLAGS@ 9@EO_CFLAGS@
11 10
12EXTRA_PROGRAMS = eo_isa eo_simple 11EXTRA_PROGRAMS = eo_isa eo_simple
diff --git a/src/lib/eet/Makefile.am b/src/lib/eet/Makefile.am
index 0cd2798441..d3ca72fc36 100644
--- a/src/lib/eet/Makefile.am
+++ b/src/lib/eet/Makefile.am
@@ -10,8 +10,8 @@ AM_CPPFLAGS = \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \ 12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
13@EET_CFLAGS@ \ 13-DEFL_EET_BUILD \
14@EFL_EET_BUILD@ 14@EET_CFLAGS@
15 15
16if HAVE_WINDOWS 16if HAVE_WINDOWS
17AM_CPPFLAGS += \ 17AM_CPPFLAGS += \
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
index e9c34a35ff..fe8c75dc85 100644
--- a/src/lib/eina/Makefile.am
+++ b/src/lib/eina/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
6-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 6-DPACKAGE_BIN_DIR=\"$(bindir)\" \
7-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 7-DPACKAGE_LIB_DIR=\"$(libdir)\" \
8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 8-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
9@EFL_EINA_BUILD@ \ 9-DEFL_EINA_BUILD \
10@EFL_PTHREAD_CFLAGS@ \ 10@EFL_PTHREAD_CFLAGS@ \
11@EINA_CFLAGS@ \ 11@EINA_CFLAGS@ \
12@VALGRIND_CFLAGS@ 12@VALGRIND_CFLAGS@
diff --git a/src/lib/eo/Makefile.am b/src/lib/eo/Makefile.am
index b3ca367ef0..02605bcd73 100644
--- a/src/lib/eo/Makefile.am
+++ b/src/lib/eo/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = \
6-I$(top_builddir)/src/lib/eina \ 6-I$(top_builddir)/src/lib/eina \
7-I$(top_builddir)/src/lib/eo \ 7-I$(top_builddir)/src/lib/eo \
8-DNDEBUG \ 8-DNDEBUG \
9@EFL_EO_BUILD@ \ 9-DEFL_EO_BUILD \
10@EO_CFLAGS@ 10@EO_CFLAGS@
11 11
12if HAVE_WINDOWS 12if HAVE_WINDOWS
diff --git a/src/modules/eina/mp/chained_pool/Makefile.am b/src/modules/eina/mp/chained_pool/Makefile.am
index 42219c5a75..257d51d13f 100644
--- a/src/modules/eina/mp/chained_pool/Makefile.am
+++ b/src/modules/eina/mp/chained_pool/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
4-I. \ 4-I. \
5-I$(top_srcdir)/src/lib/eina \ 5-I$(top_srcdir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eina \ 6-I$(top_builddir)/src/lib/eina \
7@EFL_EINA_BUILD@ \ 7-DEFL_EINA_BUILD \
8@VALGRIND_CFLAGS@ 8@VALGRIND_CFLAGS@
9 9
10controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) 10controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
diff --git a/src/modules/eina/mp/one_big/Makefile.am b/src/modules/eina/mp/one_big/Makefile.am
index 881843f91a..24dd4491d3 100644
--- a/src/modules/eina/mp/one_big/Makefile.am
+++ b/src/modules/eina/mp/one_big/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
4-I. \ 4-I. \
5-I$(top_srcdir)/src/lib/eina \ 5-I$(top_srcdir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eina \ 6-I$(top_builddir)/src/lib/eina \
7@EFL_EINA_BUILD@ \ 7-DEFL_EINA_BUILD \
8@VALGRIND_CFLAGS@ 8@VALGRIND_CFLAGS@
9 9
10controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH) 10controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
diff --git a/src/modules/eina/mp/pass_through/Makefile.am b/src/modules/eina/mp/pass_through/Makefile.am
index 40caf0bf39..56aa9e0e3d 100644
--- a/src/modules/eina/mp/pass_through/Makefile.am
+++ b/src/modules/eina/mp/pass_through/Makefile.am
@@ -4,7 +4,7 @@ AM_CPPFLAGS = \
4-I. \ 4-I. \
5-I$(top_srcdir)/src/lib/eina \ 5-I$(top_srcdir)/src/lib/eina \
6-I$(top_builddir)/src/lib/eina \ 6-I$(top_builddir)/src/lib/eina \
7@EFL_EINA_BUILD@ 7-DEFL_EINA_BUILD
8 8
9controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH) 9controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
10controller_LTLIBRARIES = module.la 10controller_LTLIBRARIES = module.la
diff --git a/src/tests/eina/Makefile.am b/src/tests/eina/Makefile.am
index 91f4178916..d396b9f02e 100644
--- a/src/tests/eina/Makefile.am
+++ b/src/tests/eina/Makefile.am
@@ -62,7 +62,7 @@ check-local: module_dummy.la
62 62
63module_dummy_la_SOURCES = eina_test_module_dummy.c 63module_dummy_la_SOURCES = eina_test_module_dummy.c
64 64
65module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) @EFL_EINA_BUILD@ 65module_dummy_la_CPPFLAGS = $(AM_CPPFLAGS) -DEFL_EINA_BUILD
66module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm 66module_dummy_la_LIBADD = $(top_builddir)/src/lib/eina/libeina.la @EINA_LIBS@ -lm
67module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 67module_dummy_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
68module_dummy_la_LIBTOOLFLAGS = --tag=disable-static 68module_dummy_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/tests/eo/Makefile.am b/src/tests/eo/Makefile.am
index b6fab2ef77..b83e7248dc 100644
--- a/src/tests/eo/Makefile.am
+++ b/src/tests/eo/Makefile.am
@@ -5,7 +5,6 @@ AM_CPPFLAGS = \
5-I$(top_srcdir)/src/lib/eo \ 5-I$(top_srcdir)/src/lib/eo \
6-I$(top_builddir)/src/lib/eina \ 6-I$(top_builddir)/src/lib/eina \
7-I$(top_builddir)/src/lib/eo \ 7-I$(top_builddir)/src/lib/eo \
8@EFL_EO_BUILD@ \
9@EO_CFLAGS@ \ 8@EO_CFLAGS@ \
10@CHECK_CFLAGS@ 9@CHECK_CFLAGS@
11 10