summaryrefslogtreecommitdiff
path: root/src/Makefile_Eina.am
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@profusion.mobi>2017-01-20 13:53:56 -0200
committerMarcel Hollerbach <marcel-hollerbach@t-online.de>2017-01-23 18:23:40 +0100
commitd9815a6837f1e06def0641da285863f87729683f (patch)
tree7ff20525c2876382bef6247108f823b0f3c82459 /src/Makefile_Eina.am
parent3d5abc081f59dda9887dbacc8e8ab24c96d5ee65 (diff)
CMake: move eina binaries to single dir, add helper macros.
For one-source directories, be smart and just define SOURCES to that, will reduce the number of too-simplistic CMakeLists.txt in our tree. This also fixes problems with libraries, they should be private, not public. So specify both kinds as different variables.
Diffstat (limited to '')
-rw-r--r--src/Makefile_Eina.am18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index ae3d94ba2f..1b6a08e760 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -263,28 +263,28 @@ lib_eina_libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
263 263
264### Binaries 264### Binaries
265 265
266bin_PROGRAMS += bin/eina/eina_btlog 266bin_PROGRAMS += bin/eina/eina_btlog/eina_btlog
267 267
268bin_eina_eina_btlog_SOURCES = bin/eina/eina_btlog.c 268bin_eina_eina_btlog_eina_btlog_SOURCES = bin/eina/eina_btlog/eina_btlog.c
269bin_eina_eina_btlog_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 269bin_eina_eina_btlog_eina_btlog_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
270-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 270-DPACKAGE_BIN_DIR=\"$(bindir)\" \
271-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 271-DPACKAGE_LIB_DIR=\"$(libdir)\" \
272-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \ 272-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
273@EINA_CFLAGS@ 273@EINA_CFLAGS@
274 274
275bin_eina_eina_btlog_LDADD = @USE_EINA_LIBS@ 275bin_eina_eina_btlog_eina_btlog_LDADD = @USE_EINA_LIBS@
276bin_eina_eina_btlog_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@ 276bin_eina_eina_btlog_eina_btlog_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
277 277
278bin_PROGRAMS += bin/eina/eina_modinfo 278bin_PROGRAMS += bin/eina/eina_modinfo/eina_modinfo
279 279
280bin_eina_eina_modinfo_SOURCES = bin/eina/eina_modinfo.c 280bin_eina_eina_modinfo_eina_modinfo_SOURCES = bin/eina/eina_modinfo.c
281bin_eina_eina_modinfo_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 281bin_eina_eina_modinfo_eina_modinfo_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
282-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 282-DPACKAGE_BIN_DIR=\"$(bindir)\" \
283-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 283-DPACKAGE_LIB_DIR=\"$(libdir)\" \
284-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \ 284-DPACKAGE_DATA_DIR=\"$(datadir)/eina\" \
285@EINA_CFLAGS@ 285@EINA_CFLAGS@
286 286
287bin_eina_eina_modinfo_LDADD = @USE_EINA_LIBS@ 287bin_eina_eina_modinfo_eina_modinfo_LDADD = @USE_EINA_LIBS@
288 288
289### Script 289### Script
290 290