Updating branch refs/heads/master
to c3dd62e9ca7e4de3d79fce5b4b63d7e34d2d9e16 (commit)
from 93a294dc61ac7ccdd6e2a276520db444983c5156 (commit)
commit c3dd62e9ca7e4de3d79fce5b4b63d7e34d2d9e16
Author: Peter de Ridder <[email protected]>
Date: Mon Aug 22 22:50:22 2011 +0200
Tidied the CFLAGS LDFLAGS LDADD in the makefiles
libsqueeze/Makefile.am | 10 ++++------
src/Makefile.am | 29 +++++++++++------------------
2 files changed, 15 insertions(+), 24 deletions(-)
diff --git a/libsqueeze/Makefile.am b/libsqueeze/Makefile.am
index 6d4f3b1..bc987c6 100644
--- a/libsqueeze/Makefile.am
+++ b/libsqueeze/Makefile.am
@@ -29,16 +29,14 @@ libsqueeze_2_la_CFLAGS = \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(GIO_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS)
+ $(LIBXFCE4UTIL_CFLAGS)
-libsqueeze_2_la_LIBADD = \
+libsqueeze_2_la_LDFLAGS = \
+ -version-info $(SQUEEZE_VERINFO) \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
$(GIO_LIBS) \
- $(LIBXFCE4UTIL_LIBS)
-
-libsqueeze_2_la_LDFLAGS = \
- -version-info $(SQUEEZE_VERINFO)
+ $(LIBXFCE4UTIL_LIBS)
libsqueeze_includedir= \
$(includedir)/libsqueeze
diff --git a/src/Makefile.am b/src/Makefile.am
index 45633ed..cdeef19 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,31 +31,24 @@ squeeze_SOURCES = \
# location_entry.c location_entry.h
squeeze_CFLAGS = \
+ -DDATADIR=\"$(datadir)\" \
+ -DSRCDIR=\"$(top_srcdir)\" \
+ -DLOCALEDIR=\"$(localedir)\" \
$(GTK_CFLAGS) \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
- $(GIO_CFLAGS) \
- $(LIBXFCE4UTIL_CFLAGS) \
- -DDATADIR=\"$(datadir)\" \
- -DSRCDIR=\"$(top_srcdir)\" \
- -DLOCALEDIR=\"$(localedir)\"
+ $(GIO_CFLAGS) \
+ $(LIBXFCE4UTIL_CFLAGS)
squeeze_LDADD = \
- $(top_builddir)/libsqueeze/libsqueeze-2.la \
- $(GTK_LIBS) \
- $(GLIB_LIBS) \
- $(GTHREAD_LIBS) \
- $(GIO_LIBS) \
- $(LIBEXIF_LIBS) \
- $(CAIRO_LIBS) \
- $(XFCONF_LIBS) \
- $(LIBXFCE4UTIL_LIBS) \
- -lX11
+ $(top_builddir)/libsqueeze/libsqueeze-2.la
squeeze_LDFLAGS = \
- -no-undefined \
- $(LIBSM_LDFLAGS) \
- $(PLATFORM_LDFLAGS)
+ $(GTK_LIBS) \
+ $(GLIB_LIBS) \
+ $(GIO_LIBS) \
+ $(XFCONF_LIBS) \
+ $(LIBXFCE4UTIL_LIBS)
INCLUDES = \
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
