summaryrefslogtreecommitdiff
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
parent2ac9e788c689f2ca850d373a19a9e85237198573 (diff)
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 @@
2if HAVE_WINDOWS 2if HAVE_WINDOWS
3### Library 3### Library
4 4
5lib_LTLIBRARIES += lib/evil/libevil.la lib/evil/libdl.la 5lib_LTLIBRARIES += lib/evil/libevil.la
6 6
7install_evilheadersdir = $(includedir)/evil-@VMAJ@ 7install_evilheadersdir = $(includedir)/evil-@VMAJ@
8dist_install_evilheaders_DATA = \ 8dist_install_evilheaders_DATA = \
9lib/evil/Evil.h \ 9lib/evil/Evil.h \
10lib/evil/evil_dlfcn.h \
10lib/evil/evil_fcntl.h \ 11lib/evil/evil_fcntl.h \
11lib/evil/evil_inet.h \ 12lib/evil/evil_inet.h \
12lib/evil/evil_langinfo.h \ 13lib/evil/evil_langinfo.h \
@@ -22,7 +23,6 @@ lib/evil/evil_time.h \
22lib/evil/evil_unistd.h \ 23lib/evil/evil_unistd.h \
23lib/evil/evil_util.h \ 24lib/evil/evil_util.h \
24lib/evil/dirent.h \ 25lib/evil/dirent.h \
25lib/evil/dlfcn.h \
26lib/evil/fnmatch.h \ 26lib/evil/fnmatch.h \
27lib/evil/pwd.h 27lib/evil/pwd.h
28 28
@@ -32,6 +32,7 @@ lib/evil/sys/mman.h
32 32
33lib_evil_libevil_la_SOURCES = \ 33lib_evil_libevil_la_SOURCES = \
34lib/evil/evil_dirent.c \ 34lib/evil/evil_dirent.c \
35lib/evil/evil_dlfcn.c \
35lib/evil/evil_fcntl.c \ 36lib/evil/evil_fcntl.c \
36lib/evil/evil_fnmatch.c \ 37lib/evil/evil_fnmatch.c \
37lib/evil/evil_fnmatch_list_of_states.c \ 38lib/evil/evil_fnmatch_list_of_states.c \
@@ -51,6 +52,7 @@ lib/evil/evil_util.c \
51lib/evil/evil_private.h \ 52lib/evil/evil_private.h \
52lib/evil/evil_fnmatch_private.h 53lib/evil/evil_fnmatch_private.h
53 54
55lib_evil_libevil_la_CPPFLAGS = @EVIL_CPPFLAGS@
54lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ @EVIL_CFLAGS_WRN@ -D__USE_MINGW_ANSI_STDIO 56lib_evil_libevil_la_CFLAGS = @EVIL_CFLAGS@ @EVIL_CFLAGS_WRN@ -D__USE_MINGW_ANSI_STDIO
55lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ @EVIL_CFLAGS@ 57lib_evil_libevil_la_CXXFLAGS = @EVIL_CXXFLAGS@ @EVIL_CFLAGS@
56lib_evil_libevil_la_LIBADD = @EVIL_LIBS@ 58lib_evil_libevil_la_LIBADD = @EVIL_LIBS@
@@ -71,23 +73,11 @@ lib/evil/regex/cname.h \
71lib/evil/regex/regex2.h \ 73lib/evil/regex/regex2.h \
72lib/evil/regex/utils.h 74lib/evil/regex/utils.h
73 75
74lib_evil_libevil_la_CPPFLAGS = \ 76lib_evil_libevil_la_CPPFLAGS += \
75-I$(top_srcdir)/src/lib/evil \ 77-I$(top_srcdir)/src/lib/evil \
76-I$(top_srcdir)/src/lib/evil/regex \ 78-I$(top_srcdir)/src/lib/evil/regex \
77-DPOSIX_MISTAKE 79-DPOSIX_MISTAKE
78 80
79#libdl
80
81lib_evil_libdl_la_SOURCES = lib/evil/dlfcn.c
82
83lib_evil_libdl_la_CPPFLAGS = \
84-I$(top_builddir)/src/lib/efl \
85@EVIL_CFLAGS@ \
86@EVIL_DLFCN_CPPFLAGS@
87lib_evil_libdl_la_LIBADD = @USE_EVIL_LIBS@ @EVIL_DLFCN_LIBS@
88lib_evil_libdl_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
89lib_evil_libdl_la_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
90
91### Binary 81### Binary
92 82
93bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil 83bin_PROGRAMS += bin/evil/evil_suite bin/evil/test_evil
@@ -120,12 +110,12 @@ bin/evil/evil_test_util.h
120#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below! 110#suite_SOURCES += bin/evil/memcpy_glibc_i686.S # see EXTRA_DIST below!
121 111
122bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@ 112bin_evil_evil_suite_CPPFLAGS = -I$(top_builddir)/src/lib/efl @EVIL_CFLAGS@
123bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ -lm 113bin_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ -lm
124bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@ 114bin_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
125 115
126bin_evil_test_evil_SOURCES = bin/evil/test_evil.c 116bin_evil_test_evil_SOURCES = bin/evil/test_evil.c
127bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@ 117bin_evil_test_evil_LDADD = @USE_EVIL_LIBS@
128bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@ 118bin_evil_test_evil_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
129 119
130### Unit tests 120### Unit tests
131 121
@@ -147,8 +137,8 @@ tests_evil_evil_suite_CPPFLAGS = \
147-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \ 137-DTESTS_BUILD_DIR=PACKAGE_BUILD_DIR \
148@CHECK_CFLAGS@ \ 138@CHECK_CFLAGS@ \
149@EVIL_CFLAGS@ 139@EVIL_CFLAGS@
150tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @DL_LIBS@ @CHECK_LIBS@ 140tests_evil_evil_suite_LDADD = @USE_EVIL_LIBS@ @CHECK_LIBS@
151tests_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@ @DL_INTERNAL_LIBS@ 141tests_evil_evil_suite_DEPENDENCIES = @USE_EVIL_INTERNAL_LIBS@
152 142
153endif 143endif
154 144