-# Copyright © 2009-2012 Nick Bowler
+# Copyright © 2009-2012, 2015 Nick Bowler
#
# License WTFPL2: Do What The Fuck You Want To Public License, version 2.
# This is free software: you are free to do what the fuck you want to.
EXTRA_DIST = $(MAINTAINERCLEANFILES) m4/gnulib-cache.m4
AM_CPPFLAGS = -I$(top_builddir)/src -I$(top_srcdir)/src \
+ -I$(top_srcdir)/$(DX_BASEDIR)/src \
-I$(top_builddir)/lib -I$(top_srcdir)/lib \
-DPKGLIBDIR=\"$(pkglibdir)\" -DPKGDATADIR=\"$(pkgdatadir)\"
upkg_LDADD = libuobject.la libupkg.la libgnu.la $(GLIB_LIBS)
$(upkg_OBJECTS): $(gnulib_headers)
-libupkg_la_SOURCES = src/libupkg.c src/pack.c
+libupkg_la_SOURCES = src/libupkg.c common/src/pack.c common/src/pack.h
uobjectdir = $(includedir)/uobject
uobject_HEADERS = src/uobject/uobject.h src/uobject/exportable.h \
EXTRA_DIST += $(TESTS)
# Supporting rules for GObject Builder
-GOB_V = $(GOB_V_$(V))
-GOB_V_ = $(GOB_V_$(AM_DEFAULT_VERBOSITY))
-GOB_V_0 = @echo " GOB " $<;
+GOB_V = $(GOB_V_@AM_V@)
+GOB_V_ = $(GOB_V_@AM_DEFAULT_V@)
+GOB_V_0 = @printf ' %$(DX_ALIGN_V)s %s\n' 'GOB ' $<;
# Unfortunately, GOB's output filenames depend on the contents of the gob file,
# rather than its filename. This isn't really suitable for use with make, so