summaryrefslogtreecommitdiff
path: root/legacy
diff options
context:
space:
mode:
Diffstat (limited to 'legacy')
-rw-r--r--legacy/evil/configure.ac7
-rw-r--r--legacy/evil/evil.pc.in2
-rw-r--r--legacy/evil/src/bin/Makefile.am21
-rw-r--r--legacy/evil/src/lib/Makefile.am15
-rw-r--r--legacy/evil/src/lib/dlfcn/Makefile.am5
5 files changed, 28 insertions, 22 deletions
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 8400f4a4e7..a29d8d4825 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -2,8 +2,8 @@
2### Version 2### Version
3 3
4m4_define([v_maj], [0]) 4m4_define([v_maj], [0])
5m4_define([v_min], [0]) 5m4_define([v_min], [99])
6m4_define([v_mic], [1]) 6m4_define([v_mic], [0])
7 7
8m4_define([evil_version], [v_maj.v_min.v_mic]) 8m4_define([evil_version], [v_maj.v_min.v_mic])
9 9
@@ -47,6 +47,9 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
47LT_PREREQ([2.4]) 47LT_PREREQ([2.4])
48LT_INIT([win32-dll]) 48LT_INIT([win32-dll])
49 49
50VMAJ=v_maj
51AC_SUBST(VMAJ)
52
50version_info="lt_cur:lt_rev:lt_age" 53version_info="lt_cur:lt_rev:lt_age"
51AC_SUBST(version_info) 54AC_SUBST(version_info)
52 55
diff --git a/legacy/evil/evil.pc.in b/legacy/evil/evil.pc.in
index dd4921a36b..78669377d7 100644
--- a/legacy/evil/evil.pc.in
+++ b/legacy/evil/evil.pc.in
@@ -8,4 +8,4 @@ Description: Library that ports on Windows some specific Unix functions.
8Version: @VERSION@ 8Version: @VERSION@
9Libs: -L${libdir} -levil 9Libs: -L${libdir} -levil
10Libs.private: 10Libs.private:
11Cflags: -I${includedir} 11Cflags: -I${includedir}/evil-@VMAJ@
diff --git a/legacy/evil/src/bin/Makefile.am b/legacy/evil/src/bin/Makefile.am
index 50446d3aa6..9b974dc41b 100644
--- a/legacy/evil/src/bin/Makefile.am
+++ b/legacy/evil/src/bin/Makefile.am
@@ -21,7 +21,16 @@ evil_test_link.c \
21evil_test_memcpy.c \ 21evil_test_memcpy.c \
22evil_test_mkstemp.c \ 22evil_test_mkstemp.c \
23evil_test_pipe.c \ 23evil_test_pipe.c \
24evil_test_realpath.c 24evil_test_realpath.c \
25evil_suite.h \
26evil_test_dlfcn.h \
27evil_test_environment.h \
28evil_test_gettimeofday.h \
29evil_test_link.h \
30evil_test_memcpy.h \
31evil_test_mkstemp.h \
32evil_test_pipe.h \
33evil_test_realpath.h
25 34
26if EVIL_HAVE_WINCE 35if EVIL_HAVE_WINCE
27 36
@@ -39,13 +48,3 @@ evil_suite_LDFLAGS = -Wl,--enable-auto-import
39test_evil_SOURCES = test_evil.c 48test_evil_SOURCES = test_evil.c
40test_evil_LDADD = $(top_builddir)/src/lib/libevil.la 49test_evil_LDADD = $(top_builddir)/src/lib/libevil.la
41test_evil_LDFLAGS = -Wl,--enable-auto-import 50test_evil_LDFLAGS = -Wl,--enable-auto-import
42
43EXTRA_DIST = \
44evil_suite.h \
45evil_test_dlfcn.h \
46evil_test_environment.h \
47evil_test_link.h \
48evil_test_memcpy.h \
49evil_test_mkstemp.h \
50evil_test_pipe.h \
51evil_test_realpath.h
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index a48bcfec48..8ed473fe56 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -5,7 +5,8 @@ SUBDIRS = . dlfcn
5 5
6lib_LTLIBRARIES = libevil.la 6lib_LTLIBRARIES = libevil.la
7 7
8include_HEADERS = \ 8install_evilheadersdir = $(includedir)/evil-@VMAJ@
9dist_install_evilheaders_DATA = \
9Evil.h \ 10Evil.h \
10evil_fcntl.h \ 11evil_fcntl.h \
11evil_inet.h \ 12evil_inet.h \
@@ -19,11 +20,12 @@ evil_time.h \
19evil_unistd.h \ 20evil_unistd.h \
20evil_util.h 21evil_util.h
21 22
22nobase_include_HEADERS = pwd.h sys/mman.h fnmatch.h dirent.h 23nobase_stdheadersdir = $(includedir)/evil-@VMAJ@
24dist_nobase_stdheaders_DATA = pwd.h sys/mman.h fnmatch.h dirent.h
23 25
24if EVIL_HAVE_WINCE 26if EVIL_HAVE_WINCE
25 27
26nobase_include_HEADERS += errno.h 28dist_nobase_stdheaders_DATA += errno.h
27 29
28endif 30endif
29 31
@@ -44,7 +46,9 @@ evil_string.c \
44evil_time.c \ 46evil_time.c \
45evil_unistd.c \ 47evil_unistd.c \
46evil_util.c \ 48evil_util.c \
47evil_uuid.c 49evil_uuid.c \
50evil_private.h \
51evil_fnmatch_private.h
48 52
49if EVIL_HAVE_WINCE 53if EVIL_HAVE_WINCE
50 54
@@ -71,6 +75,3 @@ else
71libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS) 75libevil_la_LINK = $(CXXLINK) $(libevil_la_LDFLAGS)
72 76
73endif 77endif
74
75
76EXTRA_DIST = evil_private.h evil_fnmatch_private.h
diff --git a/legacy/evil/src/lib/dlfcn/Makefile.am b/legacy/evil/src/lib/dlfcn/Makefile.am
index 1c2bc8244c..bb9580ca83 100644
--- a/legacy/evil/src/lib/dlfcn/Makefile.am
+++ b/legacy/evil/src/lib/dlfcn/Makefile.am
@@ -3,7 +3,10 @@ MAINTAINERCLEANFILES = Makefile.in
3 3
4lib_LTLIBRARIES = libdl.la 4lib_LTLIBRARIES = libdl.la
5 5
6include_HEADERS = dlfcn.h 6
7stdheadersdir = $(includedir)/evil-@VMAJ@
8dist_stdheaders_DATA = dlfcn.h
9
7libdl_la_SOURCES = dlfcn.c 10libdl_la_SOURCES = dlfcn.c
8 11
9libdl_la_CPPFLAGS = -DEFL_EVIL_DLFCN_BUILD 12libdl_la_CPPFLAGS = -DEFL_EVIL_DLFCN_BUILD