[packagekit] build error?
Stepan Kasal
kasal at ucw.cz
Tue Feb 19 08:46:54 PST 2008
Hello,
Matej Cepl has pointed me to this thread. I hope I can help with
the problem.
Attached please find a few patches; first, let me introduce
0001-*.patch:
It's the one you asked for.
It was not obvious where to hook the dependency on libpackagekit.la;
the included gtk-doc.make uses standard Automake hooks (= cannot be
used again) but creates another ones, e.g. dist-hook-local.
I decided to use CFILE_GLOB instead of it because it can help also
with other situations, e.g.:
git clone
./autogen.sh
cd doc
make all
# ... perhaps the user wants to see the current docs.
I have verified that with this check "make distcheck" passes.
Feel free to point out if some parts of the patch look suspicious.
This mail also contains patches 000[2-5]*. These are my random
"improvements" to autoconfigury. I have not tested them at all,
take this as a preview. I plan to finish this work tomorrow, are you
interested?
A comment about
0004-do-not-list-check_PROGRAMS-again-in-noinst_PROGRAMS.patch
"noinst_PROGRAMS" means "prerequisite of make all, but not install"
"check_PROGRAMS" means "prerequisite of make check, and not installed"
Since "all" is a prerequisite of "check", it does not make sense
to list a program in both.
Hope my patch helps. (I even hope the other patches might help. ;-)
Stepan Kasal
-------------- next part --------------
>From 28dd01783a70c758c0e5517a8c9de3f51834c247 Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal at redhat.com>
Date: Tue, 19 Feb 2008 17:10:34 +0100
Subject: [PATCH] fix "make dist" with gtk-doc enabled
The gtkdoc-scan command needs libpackagekit.la; add rules to ensure that.
(Thanks to Robin Norwood for reporting the bug and to Thomas Wood for
analysing it.)
---
docs/api/Makefile.am | 10 +++++++++-
libpackagekit/Makefile.am | 9 +++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am
index f0048c0..9cb243e 100644
--- a/docs/api/Makefile.am
+++ b/docs/api/Makefile.am
@@ -32,8 +32,10 @@ MKTMPL_OPTIONS=
FIXXREF_OPTIONS=
# Used for dependencies. The docs will be rebuilt if any of these change.
+# Actually, these are the only hooks into pre-requisities, so we are forced to
+# abuse them...
HFILE_GLOB=$(top_srcdir)/libpackagekit/*.h
-CFILE_GLOB=$(top_srcdir)/libpackagekit/*.c
+CFILE_GLOB=$(top_srcdir)/libpackagekit/*.c $(PK_LIBS)
# Header files to ignore when scanning.
IGNORE_HFILES = \
@@ -64,8 +66,14 @@ INCLUDES = \
-I$(top_srcdir)/libgbus \
$(NULL)
+# Hooked to pre-requisites (see above).
+# But do not forget the rule.
PK_LIBS = $(top_builddir)/libpackagekit/libpackagekit.la
+$(top_builddir)/libpackagekit/libpackagekit.la:
+ cd $(top_builddir)/libpackagekit; \
+ $(MAKE) $(AM_MAKEFLAGS) pk-marshal.h libpackagekit.la
+
GTKDOC_LIBS = \
$(GLIB_LIBS) \
$(DBUS_LIBS) \
diff --git a/libpackagekit/Makefile.am b/libpackagekit/Makefile.am
index 86ccc5b..992d740 100644
--- a/libpackagekit/Makefile.am
+++ b/libpackagekit/Makefile.am
@@ -21,6 +21,15 @@ SELFTEST_LIBS = \
$(top_builddir)/libselftest/libselftest.la \
$(NULL)
+## Ensure the above exist (and hope they are up-to date)--that's the
+## price for recursive make.
+$(top_builddir)/libgbus/libgbus.la:
+ cd $(top_builddir)/libgbus; \
+ $(MAKE) $(AM_MAKEFLAGS) libgbus-marshal.h libgbus.la
+$(top_builddir)/libgbus/libselftest.la:
+ cd $(top_builddir)/libselftest; \
+ $(MAKE) $(AM_MAKEFLAGS) libselftest.la
+
PK_LIBS = \
$(top_builddir)/libpackagekit/libpackagekit.la \
$(NULL)
--
1.5.4.1
-------------- next part --------------
>From e91bdfce0e78c9dbb2545c3313d1d525e58f2bce Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal at redhat.com>
Date: Tue, 19 Feb 2008 14:13:57 +0100
Subject: [PATCH] do not build pk-marshal in src/
... as it is already available through libpackagekit.la
---
libpackagekit/pk-marshal.list | 35 ++++++++++++++++++++++++++++++++++-
src/Makefile.am | 23 +----------------------
src/pk-marshal.list | 34 ----------------------------------
3 files changed, 35 insertions(+), 57 deletions(-)
mode change 120000 => 100644 libpackagekit/pk-marshal.list
delete mode 100644 src/pk-marshal.list
diff --git a/libpackagekit/pk-marshal.list b/libpackagekit/pk-marshal.list
deleted file mode 120000
index d924fc0..5532e9c
--- a/libpackagekit/pk-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-../src/pk-marshal.list
\ No newline at end of file
diff --git a/libpackagekit/pk-marshal.list b/libpackagekit/pk-marshal.list
new file mode 100644
index d924fc0..5532e9c
--- /dev/null
+++ b/libpackagekit/pk-marshal.list
@@ -0,0 +1,34 @@
+VOID:UINT,STRING,STRING
+VOID:UINT,STRING
+VOID:UINT,STRING,UINT
+VOID:UINT,UINT
+VOID:UINT,UINT,UINT,UINT
+VOID:STRING,UINT,UINT,UINT,UINT
+VOID:STRING
+VOID:STRING,BOOL
+VOID:STRING,UINT
+VOID:STRING,STRING,UINT
+VOID:STRING,UINT,STRING,STRING
+VOID:STRING,STRING
+VOID:STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,UINT
+VOID:STRING,STRING,UINT,STRING,STRING,UINT64
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT64
+VOID:STRING,STRING,STRING,STRING,STRING,UINT64
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT
+VOID:STRING,STRING,BOOL
+VOID:STRING,STRING,STRING,BOOL
+VOID:STRING,UINT,STRING,STRING
+VOID:STRING,STRING,UINT,UINT,UINT
+VOID:STRING,STRING,BOOL,UINT,UINT,STRING
+VOID:STRING,STRING,STRING,BOOL,STRING,UINT,STRING
+VOID:STRING,STRING,BOOL,STRING,UINT,STRING
+
diff --git a/src/Makefile.am b/src/Makefile.am
index b370d48..21f3cb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,8 +39,6 @@ pkbackendinclude_HEADERS = \
$(NULL)
shared_SOURCES = \
- pk-marshal.c \
- pk-marshal.h \
pk-runner.c \
pk-runner.h \
pk-backend.c \
@@ -107,18 +105,7 @@ packagekitd_LDADD += \
$(BOX_LIBS)
endif
-BUILT_SOURCES = \
- pk-marshal.c \
- pk-marshal.h \
- pk-interface.h \
- $(NULL)
-
-pk-marshal.c: pk-marshal.list
- echo "#include \"pk-marshal.h\"" > $@ && \
- glib-genmarshal $< --prefix=pk_marshal --body >> $@
-
-pk-marshal.h: pk-marshal.list
- glib-genmarshal $< --prefix=pk_marshal --header > $@
+BUILT_SOURCES = pk-interface.h
pk-interface.h: pk-interface.xml
$(LIBTOOL) --mode=execute dbus-binding-tool \
@@ -168,20 +155,12 @@ gprof: clean-gprof all check
gprof .libs/pk-self-test > gprof.txt
endif
-EXTRA_DIST = \
- pk-marshal.list \
- pk-security-polkit.c \
- pk-security-dummy.c \
- pk-interface.xml \
- $(NULL)
-
clean-local:
rm -f *~
rm -f *.out
rm -f *.gcno
rm -f gcov.txt
rm -f gprof.txt
- rm -f pk-marshal.c pk-marshal.h
CLEANFILES = *~ $(BUILT_SOURCES)
diff --git a/src/pk-marshal.list b/src/pk-marshal.list
deleted file mode 100644
index 5532e9c..0000000
--- a/src/pk-marshal.list
+++ /dev/null
@@ -1,34 +0,0 @@
-VOID:UINT,STRING,STRING
-VOID:UINT,STRING
-VOID:UINT,STRING,UINT
-VOID:UINT,UINT
-VOID:UINT,UINT,UINT,UINT
-VOID:STRING,UINT,UINT,UINT,UINT
-VOID:STRING
-VOID:STRING,BOOL
-VOID:STRING,UINT
-VOID:STRING,STRING,UINT
-VOID:STRING,UINT,STRING,STRING
-VOID:STRING,STRING
-VOID:STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,UINT
-VOID:STRING,STRING,UINT,STRING,STRING,UINT64
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT64
-VOID:STRING,STRING,STRING,STRING,STRING,UINT64
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT
-VOID:STRING,STRING,BOOL
-VOID:STRING,STRING,STRING,BOOL
-VOID:STRING,UINT,STRING,STRING
-VOID:STRING,STRING,UINT,UINT,UINT
-VOID:STRING,STRING,BOOL,UINT,UINT,STRING
-VOID:STRING,STRING,STRING,BOOL,STRING,UINT,STRING
-VOID:STRING,STRING,BOOL,STRING,UINT,STRING
-
--
1.5.4.1
-------------- next part --------------
>From 5ccc73df455da36aaeeae67e555c5b4fbc4e7ba4 Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal at redhat.com>
Date: Tue, 19 Feb 2008 17:24:36 +0100
Subject: [PATCH] clean up the rules for compiling *-marshal.list
---
libgbus/Makefile.am | 36 +++++++++++++++---------------------
libpackagekit/Makefile.am | 38 ++++++++++++++++----------------------
2 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/libgbus/Makefile.am b/libgbus/Makefile.am
index f0444b6..1e3de02 100644
--- a/libgbus/Makefile.am
+++ b/libgbus/Makefile.am
@@ -9,34 +9,28 @@ noinst_LTLIBRARIES = \
libgbus.la
libgbus_la_SOURCES = \
- libgbus-marshal.h \
- libgbus-marshal.c \
+ libgbus-marshal.list \
libgbus.c \
libgbus.h
libgbus_la_LIBADD = @DBUS_LIBS@ $(INTLLIBS) $(GLIB_LIBS)
-EXTRA_DIST = \
- libgbus-marshal.list
+GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=libgbus_marshal
-BUILT_SOURCES = \
- libgbus-marshal.c \
- libgbus-marshal.h
+.list.c:
+ (echo '/* This file has been automatically generated. Do not edit. */' && \
+ echo '#include "$*.h"' && \
+ $(GENMARSHAL_COMMAND) --body $< ) >$@
-libgbus-marshal.c: libgbus-marshal.list
- echo "#include \"libgbus-marshal.h\"" > $@ && \
- @GLIB_GENMARSHAL@ $< --prefix=libgbus_marshal --body >> $@
+.list.h:
+ $(GENMARSHAL_COMMAND) --header $< >$@
-libgbus-marshal.h: libgbus-marshal.list
- @GLIB_GENMARSHAL@ $< --prefix=libgbus_marshal --header > $@
+# Hint: build this before target "all".
+BUILT_SOURCES = libgbus-marshal.h
-clean-local:
- rm -f *~
- rm -f *.out
- rm -f *.gcno
- rm -f *.gcda
- rm -f gcov.txt
- rm -f gprof.txt
- rm -f $(BUILT_SOURCES)
+# Hint: do not delete this file.
+# (see http://bugzilla.gnome.org/172211 and 172212 for gory details.)
+non-intermediate: libgbus-marshal.c
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = *~ *.out *.gcno *.gcda gcov.txt gprof.txt \
+ libgbus-marshal.h libgbus-marshal.c
diff --git a/libpackagekit/Makefile.am b/libpackagekit/Makefile.am
index 992d740..2405d2a 100644
--- a/libpackagekit/Makefile.am
+++ b/libpackagekit/Makefile.am
@@ -60,8 +60,7 @@ libpackagekit_include_HEADERS = \
libpackagekit_la_SOURCES = \
pk-debug.c \
pk-debug.h \
- pk-marshal.c \
- pk-marshal.h \
+ pk-marshal.list \
pk-extra.c \
pk-extra.h \
pk-extra-obj.c \
@@ -138,20 +137,22 @@ pk_self_test_LDADD = \
TESTS = pk-self-test
endif
-EXTRA_DIST = \
- pk-marshal.list
+GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=pk_marshal
-BUILT_SOURCES = \
- pk-marshal.c \
- pk-marshal.h \
- $(NULL)
+.list.c:
+ (echo '/* This file has been automatically generated. Do not edit. */' && \
+ echo '#include "$*.h"' && \
+ $(GENMARSHAL_COMMAND) --body $< ) >$@
+
+.list.h:
+ $(GENMARSHAL_COMMAND) --header $< >$@
-pk-marshal.c: pk-marshal.list
- echo "#include \"pk-marshal.h\"" > $@ && \
- @GLIB_GENMARSHAL@ $< --prefix=pk_marshal --body >> $@
+# Hint: build this before target "all".
+BUILT_SOURCES = pk-marshal.h
-pk-marshal.h: pk-marshal.list
- @GLIB_GENMARSHAL@ $< --prefix=pk_marshal --header > $@
+# Hint: do not delete this file.
+# (see http://bugzilla.gnome.org/172211 and 172212 for gory details.)
+non-intermediate: pk-marshal.c
if PK_BUILD_GCOV
clean-gcov:
@@ -167,13 +168,6 @@ gprof: clean-gprof all check
gprof .libs/pk-self-test > gprof.txt
endif
-CLEANFILES = $(BUILT_SOURCES)
-
-clean-local:
- rm -f *~
- rm -f *.gcno
- rm -f *.out
- rm -f gcov.txt
- rm -f gprof.txt
- rm -f $(CLEANFILES)
+CLEANFILES = *~ *.gcno *.out gcov.txt gprof.txt \
+ pk-marshal.h pk-marshal.c
--
1.5.4.1
-------------- next part --------------
>From 64244e2530228085d6c9449427db002e140dd23a Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal at redhat.com>
Date: Tue, 19 Feb 2008 17:29:19 +0100
Subject: [PATCH] do not list check_PROGRAMS again in noinst_PROGRAMS
---
libpackagekit/Makefile.am | 3 ---
src/Makefile.am | 3 ---
2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/libpackagekit/Makefile.am b/libpackagekit/Makefile.am
index 2405d2a..62623df 100644
--- a/libpackagekit/Makefile.am
+++ b/libpackagekit/Makefile.am
@@ -120,9 +120,6 @@ if PK_BUILD_TESTS
check_PROGRAMS = \
pk-self-test
-noinst_PROGRAMS = \
- pk-self-test
-
pk_self_test_SOURCES = \
pk-self-test.c \
$(NULL)
diff --git a/src/Makefile.am b/src/Makefile.am
index 21f3cb0..ff92f7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -119,9 +119,6 @@ if PK_BUILD_TESTS
check_PROGRAMS = \
pk-self-test
-noinst_PROGRAMS = \
- pk-self-test
-
pk_self_test_SOURCES = \
pk-self-test.c \
$(shared_SOURCES) \
--
1.5.4.1
-------------- next part --------------
>From 0d3c1a13653d46375a3a0414f3b786d2c2ec7488 Mon Sep 17 00:00:00 2001
From: Stepan Kasal <skasal at redhat.com>
Date: Tue, 19 Feb 2008 16:17:11 +0100
Subject: [PATCH] Use $(VAR) syntax in makefiles, not @VAR at .
---
backends/alpm/Makefile.am | 6 +++---
backends/apt/Makefile.am | 8 ++++----
backends/apt2/Makefile.am | 6 +++---
backends/box/Makefile.am | 6 +++---
backends/conary/Makefile.am | 6 +++---
backends/dummy/Makefile.am | 6 +++---
backends/opkg/Makefile.am | 6 +++---
backends/pisi/Makefile.am | 6 +++---
backends/smart/Makefile.am | 6 +++---
backends/test/Makefile.am | 26 +++++++++++++-------------
backends/yum/Makefile.am | 6 +++---
backends/yum2/Makefile.am | 6 +++---
backends/zypp/Makefile.am | 8 ++++----
libgbus/Makefile.am | 2 +-
libselftest/Makefile.am | 2 +-
15 files changed, 53 insertions(+), 53 deletions(-)
diff --git a/backends/alpm/Makefile.am b/backends/alpm/Makefile.am
index 48588ca..445d23c 100644
--- a/backends/alpm/Makefile.am
+++ b/backends/alpm/Makefile.am
@@ -1,7 +1,7 @@
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_alpm.la
libpk_backend_alpm_la_SOURCES = pk-backend-alpm.c
-libpk_backend_alpm_la_LIBADD = @PK_PLUGIN_LIBS@ -lalpm
+libpk_backend_alpm_la_LIBADD = $(PK_PLUGIN_LIBS) -lalpm
libpk_backend_alpm_la_LDFLAGS = -module -avoid-version
-libpk_backend_alpm_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_alpm_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
diff --git a/backends/apt/Makefile.am b/backends/apt/Makefile.am
index e205138..07b4131 100644
--- a/backends/apt/Makefile.am
+++ b/backends/apt/Makefile.am
@@ -1,13 +1,13 @@
NULL =
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_apt.la
-libpk_backend_apt_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_apt_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_apt_la_LDFLAGS = -module -avoid-version $(APT_LIBS)
-libpk_backend_apt_la_CFLAGS = @PK_PLUGIN_CFLAGS@ $(APT_CFLAGS)
-libpk_backend_apt_la_CXXFLAGS = @PK_PLUGIN_CFLAGS@ $(APT_CFLAGS) -DPK_DB_DIR=\""$(PK_DB_DIR)"\"
+libpk_backend_apt_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(APT_CFLAGS)
+libpk_backend_apt_la_CXXFLAGS = $(PK_PLUGIN_CFLAGS) $(APT_CFLAGS) -DPK_DB_DIR=\""$(PK_DB_DIR)"\"
libpk_backend_apt_la_SOURCES = \
pk-backend-apt.c \
diff --git a/backends/apt2/Makefile.am b/backends/apt2/Makefile.am
index 505e5c3..9463a58 100644
--- a/backends/apt2/Makefile.am
+++ b/backends/apt2/Makefile.am
@@ -1,9 +1,9 @@
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_apt2.la
libpk_backend_apt2_la_SOURCES = pk-backend-apt2.c
-libpk_backend_apt2_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_apt2_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_apt2_la_LDFLAGS = -module -avoid-version
-libpk_backend_apt2_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_apt2_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
dbusinstancedir = $(LIBEXECDIR)
dbusinstance_DATA = \
diff --git a/backends/box/Makefile.am b/backends/box/Makefile.am
index 7e96eb7..3096dae 100644
--- a/backends/box/Makefile.am
+++ b/backends/box/Makefile.am
@@ -1,8 +1,8 @@
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_box.la
libpk_backend_box_la_SOURCES = pk-backend-box.c
-libpk_backend_box_la_LIBADD = @PK_PLUGIN_LIBS@ $(BOX_LIBS)
+libpk_backend_box_la_LIBADD = $(PK_PLUGIN_LIBS) $(BOX_LIBS)
libpk_backend_box_la_LDFLAGS = -module -avoid-version
-libpk_backend_box_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_box_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
libpk_backend_box_la_INCLUDES = $(BOX_CFLAGS)
diff --git a/backends/conary/Makefile.am b/backends/conary/Makefile.am
index 49902b2..35d8b98 100644
--- a/backends/conary/Makefile.am
+++ b/backends/conary/Makefile.am
@@ -1,8 +1,8 @@
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_conary.la
libpk_backend_conary_la_SOURCES = pk-backend-conary.c
-libpk_backend_conary_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_conary_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_conary_la_LDFLAGS = -module -avoid-version
-libpk_backend_conary_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_conary_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
diff --git a/backends/dummy/Makefile.am b/backends/dummy/Makefile.am
index daff2d6..dc713fa 100644
--- a/backends/dummy/Makefile.am
+++ b/backends/dummy/Makefile.am
@@ -1,7 +1,7 @@
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_dummy.la
libpk_backend_dummy_la_SOURCES = pk-backend-dummy.c
-libpk_backend_dummy_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_dummy_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_dummy_la_LDFLAGS = -module -avoid-version
-libpk_backend_dummy_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_dummy_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
diff --git a/backends/opkg/Makefile.am b/backends/opkg/Makefile.am
index a9615a8..ac05d44 100644
--- a/backends/opkg/Makefile.am
+++ b/backends/opkg/Makefile.am
@@ -1,8 +1,8 @@
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_opkg.la
libpk_backend_opkg_la_SOURCES = pk-backend-opkg.c
-libpk_backend_opkg_la_LIBADD = @PK_PLUGIN_LIBS@ $(OPKG_LIBS)
+libpk_backend_opkg_la_LIBADD = $(PK_PLUGIN_LIBS) $(OPKG_LIBS)
libpk_backend_opkg_la_LDFLAGS = -module -avoid-version
-libpk_backend_opkg_la_CFLAGS = @PK_PLUGIN_CFLAGS@ $(OPKG_CFLAGS)
+libpk_backend_opkg_la_CFLAGS = $(PK_PLUGIN_CFLAGS) $(OPKG_CFLAGS)
diff --git a/backends/pisi/Makefile.am b/backends/pisi/Makefile.am
index e0c28d0..e51f285 100644
--- a/backends/pisi/Makefile.am
+++ b/backends/pisi/Makefile.am
@@ -1,8 +1,8 @@
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_pisi.la
libpk_backend_pisi_la_SOURCES = pk-backend-pisi.c
-libpk_backend_pisi_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_pisi_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_pisi_la_LDFLAGS = -module -avoid-version
-libpk_backend_pisi_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_pisi_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
diff --git a/backends/smart/Makefile.am b/backends/smart/Makefile.am
index 6fae321..c790201 100644
--- a/backends/smart/Makefile.am
+++ b/backends/smart/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_smart.la
libpk_backend_smart_la_SOURCES = pk-backend-smart.c
-libpk_backend_smart_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_smart_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_smart_la_LDFLAGS = -module -avoid-version
-libpk_backend_smart_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_smart_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
diff --git a/backends/test/Makefile.am b/backends/test/Makefile.am
index cc4a04d..6879d45 100644
--- a/backends/test/Makefile.am
+++ b/backends/test/Makefile.am
@@ -1,5 +1,5 @@
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = \
libpk_backend_test_dbus.la \
libpk_backend_test_nop.la \
@@ -9,32 +9,32 @@ plugin_LTLIBRARIES = \
libpk_backend_test_thread.la
libpk_backend_test_dbus_la_SOURCES = pk-backend-test-dbus.c
-libpk_backend_test_dbus_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_test_dbus_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_dbus_la_LDFLAGS = -module -avoid-version
-libpk_backend_test_dbus_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_test_dbus_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
libpk_backend_test_nop_la_SOURCES = pk-backend-test-nop.c
-libpk_backend_test_nop_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_test_nop_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_nop_la_LDFLAGS = -module -avoid-version
-libpk_backend_test_nop_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_test_nop_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
libpk_backend_test_fail_la_SOURCES = pk-backend-test-fail.c
-libpk_backend_test_fail_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_test_fail_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_fail_la_LDFLAGS = -module -avoid-version
-libpk_backend_test_fail_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_test_fail_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
libpk_backend_test_spawn_la_SOURCES = pk-backend-test-spawn.c
-libpk_backend_test_spawn_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_test_spawn_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_spawn_la_LDFLAGS = -module -avoid-version
-libpk_backend_test_spawn_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_test_spawn_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
libpk_backend_test_succeed_la_SOURCES = pk-backend-test-succeed.c
-libpk_backend_test_succeed_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_test_succeed_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_succeed_la_LDFLAGS = -module -avoid-version
-libpk_backend_test_succeed_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_test_succeed_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
libpk_backend_test_thread_la_SOURCES = pk-backend-test-thread.c
-libpk_backend_test_thread_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_test_thread_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_test_thread_la_LDFLAGS = -module -avoid-version
-libpk_backend_test_thread_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_test_thread_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
diff --git a/backends/yum/Makefile.am b/backends/yum/Makefile.am
index 8f5dd24..7fa3d2f 100644
--- a/backends/yum/Makefile.am
+++ b/backends/yum/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_yum.la
libpk_backend_yum_la_SOURCES = pk-backend-yum.c
-libpk_backend_yum_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_yum_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_yum_la_LDFLAGS = -module -avoid-version
-libpk_backend_yum_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_yum_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
clean-local:
rm -f *.gcno
diff --git a/backends/yum2/Makefile.am b/backends/yum2/Makefile.am
index a3fb218..e159794 100644
--- a/backends/yum2/Makefile.am
+++ b/backends/yum2/Makefile.am
@@ -1,10 +1,10 @@
SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_yum2.la
libpk_backend_yum2_la_SOURCES = pk-backend-yum2.c
-libpk_backend_yum2_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_yum2_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_yum2_la_LDFLAGS = -module -avoid-version
-libpk_backend_yum2_la_CFLAGS = @PK_PLUGIN_CFLAGS@
+libpk_backend_yum2_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
clean-local:
rm -f *.gcno
diff --git a/backends/zypp/Makefile.am b/backends/zypp/Makefile.am
index 8504f4b..0de41d2 100644
--- a/backends/zypp/Makefile.am
+++ b/backends/zypp/Makefile.am
@@ -1,13 +1,13 @@
#SUBDIRS = helpers
-plugindir = @PK_PLUGIN_DIR@
+plugindir = $(PK_PLUGIN_DIR)
plugin_LTLIBRARIES = libpk_backend_zypp.la
libpk_backend_zypp_la_SOURCES = \
pk-backend-zypp.cpp \
zypp-utils.cpp
-libpk_backend_zypp_la_LIBADD = @PK_PLUGIN_LIBS@
+libpk_backend_zypp_la_LIBADD = $(PK_PLUGIN_LIBS)
libpk_backend_zypp_la_LDFLAGS = -module -avoid-version $(ZYPP_LIBS)
-libpk_backend_zypp_la_CFLAGS = @PK_PLUGIN_CFLAGS@
-libpk_backend_zypp_la_CPPFLAGS = @PK_PLUGIN_CFLAGS@ $(ZYPP_CFLAGS) -Wno-deprecated
+libpk_backend_zypp_la_CFLAGS = $(PK_PLUGIN_CFLAGS)
+libpk_backend_zypp_la_CPPFLAGS = $(PK_PLUGIN_CFLAGS) $(ZYPP_CFLAGS) -Wno-deprecated
EXTRA_DIST = \
zypp-utils.h \
diff --git a/libgbus/Makefile.am b/libgbus/Makefile.am
index 1e3de02..4b380af 100644
--- a/libgbus/Makefile.am
+++ b/libgbus/Makefile.am
@@ -12,7 +12,7 @@ libgbus_la_SOURCES = \
libgbus-marshal.list \
libgbus.c \
libgbus.h
-libgbus_la_LIBADD = @DBUS_LIBS@ $(INTLLIBS) $(GLIB_LIBS)
+libgbus_la_LIBADD = $(DBUS_LIBS) $(INTLLIBS) $(GLIB_LIBS)
GENMARSHAL_COMMAND = $(GLIB_GENMARSHAL) --prefix=libgbus_marshal
diff --git a/libselftest/Makefile.am b/libselftest/Makefile.am
index a777fb1..82a75ef 100644
--- a/libselftest/Makefile.am
+++ b/libselftest/Makefile.am
@@ -11,7 +11,7 @@ noinst_LTLIBRARIES = \
libselftest_la_SOURCES = \
libselftest.c \
libselftest.h
-libselftest_la_LIBADD = @DBUS_LIBS@ $(INTLLIBS) $(GLIB_LIBS)
+libselftest_la_LIBADD = $(DBUS_LIBS) $(INTLLIBS) $(GLIB_LIBS)
clean-local:
rm -f *~
--
1.5.4.1
More information about the PackageKit
mailing list