commit 1154f66ebef32b03d49b1e37bfeae25863c40514
Author: phantomjinx <p.g...@ph...>
Date: Thu Apr 19 21:17:43 2012 +0100
Tidy up variables for library compilation
* configure.ac
* Set the so version of the atomic parsley library
* Some default CFLAGS are inappropriate for C++ compilation so provide
reduced CFLAGS for atomic parsley library
* libgkpod/Makefile.am
* Remove unnecessary variable definitions
* atomic-parsley/Makefile.am
* Apply CFLAGS and SO_VERSION to library
configure.ac | 8 ++++++++
libgtkpod/Makefile.am | 3 ---
libs/atomic-parsley/AtomicParsley.cpp | 2 --
libs/atomic-parsley/Makefile.am | 4 ++--
4 files changed, 10 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5a4d9ea..779f3dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,11 +15,13 @@ dnl libtool versioning
# ? :+1 : ? == just internal changes
# CURRENT : REVISION : AGE
LIBGTKPOD_SO_VERSION="2:0:1"
+LIBATOMIC_PARSLEY_SO_VERSION="0:1:0"
LIBGTKPOD_VERSION=`./version.sh`
AC_SUBST(LIBGTKPOD_SO_VERSION)
AC_SUBST(LIBGTKPOD_VERSION)
+AC_SUBST(LIBATOMIC_PARSLEY_SO_VERSION)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
@@ -401,6 +403,12 @@ libgpod_version=`$PKG_CONFIG libgpod-1.0 --modversion`
AC_DEFINE_UNQUOTED(LIBGPOD_VERSION, "${libgpod_version}", [Set this to the libgpod version])
+dnl Setup Atomic Parsley library flags
+dnl --------------------------
+LIBATOMIC_CFLAGS="$ATOMIC_CFLAGS -Wall"
+LIBATOMIC_CFLAGS="$ATOMIC_CFLAGS $GTK_CFLAGS $GLIB_CFLAGS $GDK_CFLAGS $GMODULE_CFLAGS $GTHREAD_CFLAGS $LIBGPOD_CFLAGS $GTK_CLEANLINESS_FLAGS"
+AC_SUBST(LIBATOMIC_CFLAGS)
+
dnl Setup Gtkpod flags for building library
dnl --------------------------
LIBGTKPOD_CFLAGS="$CFLAGS"
diff --git a/libgtkpod/Makefile.am b/libgtkpod/Makefile.am
index 9c4541c..464741f 100644
--- a/libgtkpod/Makefile.am
+++ b/libgtkpod/Makefile.am
@@ -56,9 +56,6 @@ libgtkpodincludebase = $(includedir)/gtkpod
libgtkpodincludedir = $(libgtkpodincludebase)/gtkpod
libgtkpodinclude_HEADERS = gp_itdb.h gtkpod_app_iface.h
-INCLUDES=$(LIBGTKPOD_CFLAGS)
-LIBS=$(LIBGTKPOD_LIBS) -lm
-
EXTRA_DIST = gtkpod_app-marshallers.list
all-local: gtkpod_app-marshallers.h gtkpod_app-marshallers.c
diff --git a/libs/atomic-parsley/AtomicParsley.cpp b/libs/atomic-parsley/AtomicParsley.cpp
index 36c4a42..8603885 100644
--- a/libs/atomic-parsley/AtomicParsley.cpp
+++ b/libs/atomic-parsley/AtomicParsley.cpp
@@ -46,8 +46,6 @@
#include "AP_NSFile_utils.h"
#endif
-#define DEBUG_V
-
///////////////////////////////////////////////////////////////////////////////////////
// Global Variables //
///////////////////////////////////////////////////////////////////////////////////////
diff --git a/libs/atomic-parsley/Makefile.am b/libs/atomic-parsley/Makefile.am
index e429b26..d1573a1 100644
--- a/libs/atomic-parsley/Makefile.am
+++ b/libs/atomic-parsley/Makefile.am
@@ -24,9 +24,9 @@ AM_CPPFLAGS = \
-DGTKPOD_IMAGE_DIR=\""$(gtkpod_image_dir)"\" \
-DGTKPOD_SCRIPT_DIR=\""$(gtkpod_script_dir)"\" \
-I$(top_srcdir) \
- $(GTKPOD_CFLAGS)
+ $(LIBATOMIC_CFLAGS)
-libatomicparsley_la_LDFLAGS = $(LDFLAGS)
+libatomicparsley_la_LDFLAGS = $(LDFLAGS) -version-info $(LIBATOMIC_PARSLEY_SO_VERSION)
libatomicparsley_la_LIBADD = \
$(GTKPOD_LIBS) \
@LIBOBJS@
|
