[PATCH] Use $(VAR) syntax in makefiles, not @VAR at .
Stepan Kasal
skasal at redhat.com
Tue Feb 19 07:17:11 PST 2008
---
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
--ibTvN161/egqYuK8--
More information about the PackageKit
mailing list