summaryrefslogtreecommitdiff
path: root/legacy/evil
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2012-08-20 15:46:37 +0000
committerVincent Torri <vincent.torri@gmail.com>2012-08-20 15:46:37 +0000
commit8b9e7449ec1bcc46d6cdd4c7a5e0eebe85be5a5c (patch)
tree148923f9ee7f831d88b8f5b6d35916dd2d02c0a7 /legacy/evil
parenta9593bd3fa301798c5eafc14d91d184fa1800e03 (diff)
Evil: quoting + fix distcheck rule
SVN revision: 75468
Diffstat (limited to 'legacy/evil')
-rw-r--r--legacy/evil/ChangeLog9
-rw-r--r--legacy/evil/Makefile.am2
-rw-r--r--legacy/evil/configure.ac7
-rw-r--r--legacy/evil/src/lib/Makefile.am8
4 files changed, 21 insertions, 5 deletions
diff --git a/legacy/evil/ChangeLog b/legacy/evil/ChangeLog
index 80ed084671..53098610cd 100644
--- a/legacy/evil/ChangeLog
+++ b/legacy/evil/ChangeLog
@@ -1,3 +1,12 @@
12012-08-20 Vincent Torri <doursse at users dot sf dot net>
2
3 * configure.ac:
4 quoting.
5
6 * Makefile.am:
7 * src/lib/Makefile.am:
8 fix distcheck
9
12012-08-19 Vincent Torri <doursse at users dot sf dot net> 102012-08-19 Vincent Torri <doursse at users dot sf dot net>
2 11
3 * configure.ac: 12 * configure.ac:
diff --git a/legacy/evil/Makefile.am b/legacy/evil/Makefile.am
index 6e86f8a3c9..e5f77b5f70 100644
--- a/legacy/evil/Makefile.am
+++ b/legacy/evil/Makefile.am
@@ -1,7 +1,7 @@
1 1
2ACLOCAL_AMFLAGS = -I m4 -I m4/common -I m4/evil 2ACLOCAL_AMFLAGS = -I m4 -I m4/common -I m4/evil
3 3
4DISTCHECK_CONFIGURE_FLAGS = --host=$(host_triplet) 4DISTCHECK_CONFIGURE_FLAGS = --host=$(host_triplet) --disable-static
5 5
6MAINTAINERCLEANFILES = \ 6MAINTAINERCLEANFILES = \
7aclocal.m4 \ 7aclocal.m4 \
diff --git a/legacy/evil/configure.ac b/legacy/evil/configure.ac
index 0682c70d59..26c9f82c41 100644
--- a/legacy/evil/configure.ac
+++ b/legacy/evil/configure.ac
@@ -48,10 +48,10 @@ lt_cv_deplibs_check_method='pass_all'
48LT_INIT([win32-dll]) 48LT_INIT([win32-dll])
49 49
50VMAJ=v_maj 50VMAJ=v_maj
51AC_SUBST(VMAJ) 51AC_SUBST([VMAJ])
52 52
53version_info="lt_cur:lt_rev:lt_age" 53version_info="lt_cur:lt_rev:lt_age"
54AC_SUBST(version_info) 54AC_SUBST([version_info])
55 55
56 56
57### Needed information 57### Needed information
@@ -62,7 +62,7 @@ EFL_SELECT_WINDOWS_VERSION
62### Checks for programs 62### Checks for programs
63AM_PROG_AS 63AM_PROG_AS
64AC_PROG_CXX 64AC_PROG_CXX
65AC_LANG(C) 65AC_LANG([C])
66AC_PROG_CPP 66AC_PROG_CPP
67AC_PROG_CC 67AC_PROG_CC
68 68
@@ -100,7 +100,6 @@ AC_CHECK_HEADERS([errno.h])
100 100
101 101
102### Checks for compiler characteristics 102### Checks for compiler characteristics
103AC_C_CONST
104EFL_ATTRIBUTE_UNUSED 103EFL_ATTRIBUTE_UNUSED
105 104
106win32_cppflags="" 105win32_cppflags=""
diff --git a/legacy/evil/src/lib/Makefile.am b/legacy/evil/src/lib/Makefile.am
index bbcb1729ed..6f41347a20 100644
--- a/legacy/evil/src/lib/Makefile.am
+++ b/legacy/evil/src/lib/Makefile.am
@@ -122,3 +122,11 @@ EXTRA_DIST = gdtoa/README gdtoa/README.mingw
122 122
123install-data-hook: 123install-data-hook:
124 rm -f $(libdir)/libevil.la $(libdir)/libdl.la 124 rm -f $(libdir)/libevil.la $(libdir)/libdl.la
125
126uninstall-local:
127 rm -f $(DESTDIR)$(bindir)/libevil-@VMAJ@.dll
128 rm -f $(DESTDIR)$(bindir)/libdl-@VMAJ@.dll
129 rm -f $(DESTDIR)$(libdir)/libevil.dll.a
130 rm -f $(DESTDIR)$(libdir)/libevil.a
131 rm -f $(DESTDIR)$(libdir)/libdl.dll.a
132 rm -f $(DESTDIR)$(libdir)/libdl.a