[libslab] Hack the build system so that people can easily use internal copies
- From: Vincent Untz <vuntz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [libslab] Hack the build system so that people can easily use internal copies
- Date: Tue, 11 Aug 2009 09:48:42 +0000 (UTC)
commit aee86331c44e6fbd101146c9285db7e15d6f7791
Author: Vincent Untz <vuntz gnome org>
Date: Tue Aug 11 11:47:38 2009 +0200
Hack the build system so that people can easily use internal copies
The internal copies won't install a system library or headers.
configure.ac | 8 +++++---
libslab/Makefile.am | 6 ++++++
2 files changed, 11 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index cb3b60f..e2e80db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,9 +96,11 @@ ac_cv_lkstrftime=yes
])
AC_MSG_RESULT($ac_cv_lkstrftime)
-dnl ==============================================
-dnl End: strftime
-dnl ==============================================
+dnl ===============================================
+dnl Enable internal copies of libslab, but not here
+dnl ===============================================
+
+AM_CONDITIONAL(LIBSLAB_FOR_INTERNAL_USE, test "yes" = "no")
AC_CONFIG_FILES([
Makefile
diff --git a/libslab/Makefile.am b/libslab/Makefile.am
index d2ffe6a..771e840 100644
--- a/libslab/Makefile.am
+++ b/libslab/Makefile.am
@@ -26,7 +26,11 @@ HEADER_FILES= \
system-tile.h \
tile.h
+if !LIBSLAB_FOR_INTERNAL_USE
lib_LTLIBRARIES = libslab.la
+else
+noinst_LTLIBRARIES = libslab.la
+endif
libslab_la_SOURCES = \
$(MARSHAL_GENERATED) \
@@ -53,10 +57,12 @@ libslab_la_SOURCES = \
tile-action.c \
tile.c
+if !LIBSLAB_FOR_INTERNAL_USE
libslab_includedir = $(includedir)/libslab
libslab_include_HEADERS = $(HEADER_FILES)
libslab_la_LDFLAGS = -version-info $(LT_VERSION)
+endif
libslab_la_LIBADD = $(LIBSLAB_LIBS)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]