aboutsummaryrefslogtreecommitdiffstats
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
parentevas/gl - removed unnecessary lines which causes the resource leak and corrup... (diff)
downloadefl-8b9e7449ec1bcc46d6cdd4c7a5e0eebe85be5a5c.tar.gz
Evil: quoting + fix distcheck rule
SVN revision: 75468
-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 @@
+2012-08-20 Vincent Torri <doursse at users dot sf dot net>
+
+ * configure.ac:
+ quoting.
+
+ * Makefile.am:
+ * src/lib/Makefile.am:
+ fix distcheck
+
2012-08-19 Vincent Torri <doursse at users dot sf dot net>
* 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 @@
ACLOCAL_AMFLAGS = -I m4 -I m4/common -I m4/evil
-DISTCHECK_CONFIGURE_FLAGS = --host=$(host_triplet)
+DISTCHECK_CONFIGURE_FLAGS = --host=$(host_triplet) --disable-static
MAINTAINERCLEANFILES = \
aclocal.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'
LT_INIT([win32-dll])
VMAJ=v_maj
-AC_SUBST(VMAJ)
+AC_SUBST([VMAJ])
version_info="lt_cur:lt_rev:lt_age"
-AC_SUBST(version_info)
+AC_SUBST([version_info])
### Needed information
@@ -62,7 +62,7 @@ EFL_SELECT_WINDOWS_VERSION
### Checks for programs
AM_PROG_AS
AC_PROG_CXX
-AC_LANG(C)
+AC_LANG([C])
AC_PROG_CPP
AC_PROG_CC
@@ -100,7 +100,6 @@ AC_CHECK_HEADERS([errno.h])
### Checks for compiler characteristics
-AC_C_CONST
EFL_ATTRIBUTE_UNUSED
win32_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
install-data-hook:
rm -f $(libdir)/libevil.la $(libdir)/libdl.la
+
+uninstall-local:
+ rm -f $(DESTDIR)$(bindir)/libevil-@VMAJ@.dll
+ rm -f $(DESTDIR)$(bindir)/libdl-@VMAJ@.dll
+ rm -f $(DESTDIR)$(libdir)/libevil.dll.a
+ rm -f $(DESTDIR)$(libdir)/libevil.a
+ rm -f $(DESTDIR)$(libdir)/libdl.dll.a
+ rm -f $(DESTDIR)$(libdir)/libdl.a