aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile_Evil.am
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2015-12-28 14:22:29 +0100
committerJean-Philippe Andre <jp.andre@samsung.com>2015-12-29 22:13:58 +0900
commit47ed848a8795c1b044f8be0dc6fb455f8bc13706 (patch)
tree758f9d41dbe0a4fb69a544d4bc1cea31421f6c38 /src/Makefile_Evil.am
parentEvas: Implement ARGY88 and GRY8 conversion to ARGB8888 (diff)
downloadefl-47ed848a8795c1b044f8be0dc6fb455f8bc13706.tar.gz
Evil: integrate the dlfcn code into Evil
This will remove some incompatibilities with other packages, especially for win-builds
Diffstat (limited to 'src/Makefile_Evil.am')
-rw-r--r--src/Makefile_Evil.am30
1 files changed, 10 insertions, 20 deletions
diff --git a/src/Makefile_Evil.am b/src/Makefile_Evil.am
index 60fc567595..d4cc0beb00 100644
--- a/src/Makefile_Evil.am
+++ b/src/Makefile_Evil.am
@@ -2,11 +2,12 @@
if HAVE_WINDOWS
### Library
-lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la
+lib_LTLIBRARIES += lib/evil/libevil.la
install_evilheadersdir = $(includedir)/evil-@VMAJ@
dist_install_evilheaders_DATA = \
lib/evil/Evil.h \
+lib/evil/evil_dlfcn.h \
lib/evil/evil_fcntl.h \
lib/evil/evil_inet.h \
lib/evil/evil_langinfo.h \
@@ -22,7 +23,6 @@ lib/evil/evil_time.h \
lib/evil/evil_unistd.h \
lib/evil/evil_util.h \
lib/evil/dirent.h \
-lib/evil/dlfcn.h \
lib/evil/fnmatch.h \
lib/evil/pwd.h
@@ -32,6 +32,7 @@ lib/evil/sys/mman.h
lib_evil_libevil_la_SOURCES = \
lib/evil/evil_dirent.c \
+lib/evil/evil_dlfcn.c \
lib/evil/evil_fcntl.c \
lib/evil/evil_fnmatch.c \
lib/evil/evil_fnmatch_list_of_states.c \
@@ -51,6 +52,7 @@ lib/evil/evil_util.c \
lib/evil/evil_private.h \
lib/evil/evil_fnmatch_private.h
+lib_evil_libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@
lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ @EVIL_CFLAGS_WRN@ -D__USE_MINGW_ANSI_STDIO
lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ @EVIL_CFLAGS@
lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
@@ -71,23 +73,11 @@ lib/evil/regex/cname.h \
lib/evil/regex/regex2.h \
lib/evil/regex/utils.h
-lib_evil_libevil_la_CPPFLAGS = \
+lib_evil_libevil_la_CPPFLAGS += \
-I$(top_srcdir)/src/lib/evil \
-I$(top_srcdir)/src/lib/evil/regex \
-DPOSIX_MISTAKE
-#libdl
-
-lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
-
-lib_evil_libdl_la_CPPFLAGS = \
--I$(top_builddir)/src/lib/efl \
-@EVIL_CFLAGS@ \
-@EVIL_DLFCN_CPPFLAGS@
-lib_evil_libdl_la_LIBADD = @USE_EVIL_LIBS@ @EVIL_DLFCN_LIBS@
-lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-lib_evil_libdl_la_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
-
### Binary
bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil
@@ -120,12 +110,12 @@ bin/evil/evil_test_util.h
#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
-bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm
-bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
+bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ -lm
+bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@
-bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
+bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
### Unit tests
@@ -147,8 +137,8 @@ tests_evil_evil_suite_CPPFLAGS = \
-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
@CHECK_CFLAGS@ \
@EVIL_CFLAGS@
-tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ @CHECK_LIBS@
-tests_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@
+tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @CHECK_LIBS@
+tests_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
endif