From 95cd2b3a5599955317d1f80d515c0d5d5c568c7d Mon Sep 17 00:00:00 2001
From: Nick Bowler <nbowler@draconx.ca>
Date: Mon, 7 Dec 2009 02:57:27 -0500
Subject: [PATCH] build: Re-arrange CFLAGS/LDFLAGS a bit.

---
 src/Makefile.am          | 7 ++++---
 src/uobject/Makefile.inc | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index f9224c3..c2019c3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,7 +4,8 @@
 # notice and this notice are preserved.  This file is offered as-is,
 # without any warranty.
 
-AM_CPPFLAGS = -DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib
+AM_LDFLAGS  = -L$(top_builddir)/lib
 
 lib_LTLIBRARIES = libupkg.la
 pkglib_LTLIBRARIES =
@@ -19,6 +20,6 @@ libupkg_la_SOURCES = libupkg.c pack.c
 
 bin_PROGRAMS  = upkg
 upkg_SOURCES  = upkg.c
-upkg_CPPFLAGS = -I$(top_builddir)/lib -I$(top_srcdir)/lib $(GLIB_CFLAGS)
-upkg_LDFLAGS  = -L$(top_builddir)/lib -export-dynamic
+upkg_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS)
+upkg_LDFLAGS  = $(AM_LDFLAGS) -export-dynamic
 upkg_LDADD    = libuobject.la libupkg.la $(GLIB_LIBS) -lgnu
diff --git a/src/uobject/Makefile.inc b/src/uobject/Makefile.inc
index 7d4761a..7c42e97 100644
--- a/src/uobject/Makefile.inc
+++ b/src/uobject/Makefile.inc
@@ -13,6 +13,7 @@ noinst_HEADERS += uobject/avl.h
 
 libuobject_la_SOURCES  = uobject/uobject.c uobject/module.c uobject/avl.c \
 	uobject/package.c uobject/loadable.c uobject/exportable.c
-libuobject_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(LTDLINCL)
+libuobject_la_CPPFLAGS = $(AM_CPPFLAGS) $(GLIB_CFLAGS) $(LTDLINCL) \
+	-DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
+libuobject_la_LDFLAGS  = $(AM_LDFLAGS) -export-symbols-regex '^u_'
 libuobject_la_LIBADD   = $(LIBLTDL) $(GLIB_LIBS)
-libuobject_la_LDFLAGS  = -export-symbols-regex '^u_'
-- 
2.43.0