# HG changeset patch
# User Eugene Paskevich <eugene@raptor.kiev.ua>
# Date 1192114009 -10800
# Node ID 03a2bb1c521e1efd81869faca7de9c4082897c65
# Parent  6d33dffd13825f71633522216fab545d55750dea
Curly vs round braces (part 2)

diff -r 6d33dffd1382 -r 03a2bb1c521e src/amidi-plug/Makefile
--- a/src/amidi-plug/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/amidi-plug/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,4 +1,4 @@
-PLUGIN = amidi-plug$(PLUGIN_SUFFIX)
+PLUGIN = amidi-plug${PLUGIN_SUFFIX}
 
 SRCS = amidi-plug.c		\
        i_vfslayer.c		\
@@ -12,14 +12,14 @@
        i_utils.c		\
        i_fileinfo.c
 
-SUBDIRS = pcfg $(AMIDIPLUG_BACKENDS)
+SUBDIRS = pcfg ${AMIDIPLUG_BACKENDS}
 
 include ../../buildsys.mk
 include ../../extra.mk
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) $(MOWGLI_CFLAGS) \
-	-DAMIDIPLUGBACKENDDIR=\"$(plugindir)/$(AMIDIPLUG_BACKEND_DIR)\" -I../../intl -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${GMODULE_CFLAGS} ${MOWGLI_CFLAGS} \
+	-DAMIDIPLUGBACKENDDIR=\"${plugindir}/${AMIDIPLUG_BACKEND_DIR}\" -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${GMODULE_LIBS} -lpthread ./pcfg/libpcfg.a
 
-plugindir := ${plugindir}/$(INPUT_PLUGIN_DIR)
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
diff -r 6d33dffd1382 -r 03a2bb1c521e src/amidi-plug/backend-alsa/Makefile
--- a/src/amidi-plug/backend-alsa/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/amidi-plug/backend-alsa/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,12 +1,12 @@
-PLUGIN = ap-alsa$(PLUGIN_SUFFIX)
+PLUGIN = ap-alsa${PLUGIN_SUFFIX}
 
 SRCS = b-alsa.c
 
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-plugindir := ${plugindir}/$(AMIDIPLUG_BACKEND_DIR)
+plugindir := ${plugindir}/${AMIDIPLUG_BACKEND_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS) $(ALSA_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(ALSA_CFLAGS) $(GLIB_CFLAGS) -I../../..
-LIBS += $(ALSA_LIBS) ../pcfg/libpcfg.a
+CFLAGS += ${PLUGIN_CFLAGS} ${ALSA_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${ALSA_CFLAGS} ${GLIB_CFLAGS} -I../../..
+LIBS += ${ALSA_LIBS} ../pcfg/libpcfg.a
diff -r 6d33dffd1382 -r 03a2bb1c521e src/amidi-plug/backend-dummy/Makefile
--- a/src/amidi-plug/backend-dummy/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/amidi-plug/backend-dummy/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,12 +1,12 @@
-PLUGIN = ap-dummy$(PLUGIN_SUFFIX)
+PLUGIN = ap-dummy${PLUGIN_SUFFIX}
 
 SRCS = b-dummy.c
 
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-plugindir := ${plugindir}/$(AMIDIPLUG_BACKEND_DIR)
+plugindir := ${plugindir}/${AMIDIPLUG_BACKEND_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../..
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} -I../../..
 LIBS += ../pcfg/libpcfg.a
diff -r 6d33dffd1382 -r 03a2bb1c521e src/amidi-plug/backend-fluidsynth/Makefile
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,12 +1,12 @@
-PLUGIN = ap-fluidsynth$(PLUGIN_SUFFIX)
+PLUGIN = ap-fluidsynth${PLUGIN_SUFFIX}
 
 SRCS = b-fluidsynth.c
 
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-plugindir := ${plugindir}/$(AMIDIPLUG_BACKEND_DIR)
+plugindir := ${plugindir}/${AMIDIPLUG_BACKEND_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS) $(FLUIDSYNTH_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(FLUIDSYNTH_CFLAGS) $(GLIB_CFLAGS) -I../../..
-LIBS += $(FLUIDSYNTH_LIBS) ../pcfg/libpcfg.a
+CFLAGS += ${PLUGIN_CFLAGS} ${FLUIDSYNTH_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${FLUIDSYNTH_CFLAGS} ${GLIB_CFLAGS} -I../../..
+LIBS += ${FLUIDSYNTH_LIBS} ../pcfg/libpcfg.a
diff -r 6d33dffd1382 -r 03a2bb1c521e src/amidi-plug/pcfg/Makefile
--- a/src/amidi-plug/pcfg/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/amidi-plug/pcfg/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -5,5 +5,5 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../..
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} -I../../..
diff -r 6d33dffd1382 -r 03a2bb1c521e src/daap/Makefile
--- a/src/daap/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/daap/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,4 +1,4 @@
-PLUGIN = libdaap$(PLUGIN_SUFFIX)
+PLUGIN = libdaap${PLUGIN_SUFFIX}
 
 SRCS = daap.c
 
@@ -7,7 +7,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := ${plugindir}/$(TRANSPORT_PLUGIN_DIR)
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 #For the moment i'm hardcoding it but it will be configurable
 #MDNS_LIBS=-ldns_sd
@@ -17,6 +17,6 @@
 INC = -I../.. -I./xmms2-daap
 WARN = -Wall -pedantic -std=c99 
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(INC) $(WARN) $(GCC42_CFLAGS)
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(MDNS_LIBS) ./xmms2-daap/xmms2-daap.a
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${PICFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${INC} ${WARN} ${GCC42_CFLAGS}
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MDNS_LIBS} ./xmms2-daap/xmms2-daap.a
diff -r 6d33dffd1382 -r 03a2bb1c521e src/daap/xmms2-daap/Makefile
--- a/src/daap/xmms2-daap/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/daap/xmms2-daap/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -19,8 +19,8 @@
 #MDNS_IMPL=DAAP_MDNS_DUMMY 
 
 WARN = -Wall -std=c99
-DEFINES = -D$(MDNS_IMPL) -D_POSIX_SOURCE
+DEFINES = -D${MDNS_IMPL} -D_POSIX_SOURCE
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) $(PICFLAGS) $(WARN) $(DEFINES)
-LIBS += $(GLIB_LIBS) 
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${PICFLAGS} ${WARN} ${DEFINES}
+LIBS += ${GLIB_LIBS} 
diff -r 6d33dffd1382 -r 03a2bb1c521e src/lirc/Makefile
--- a/src/lirc/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/lirc/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,4 +1,4 @@
-PLUGIN = lirc$(PLUGIN_SUFFIX)
+PLUGIN = lirc${PLUGIN_SUFFIX}
 
 SRCS = about.c \
        lirc.c
@@ -6,8 +6,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := ${plugindir}/$(GENERAL_PLUGIN_DIR)
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(MOWGLI_CFLAGS) $(PANGO_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) -llirc_client
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -llirc_client
diff -r 6d33dffd1382 -r 03a2bb1c521e src/modplug/gui/Makefile
--- a/src/modplug/gui/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/modplug/gui/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -8,6 +8,6 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-CFLAGS   += $(PLUGIN_CFLAGS)
-CXXFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../..
+CFLAGS   += ${PLUGIN_CFLAGS}
+CXXFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../..
diff -r 6d33dffd1382 -r 03a2bb1c521e src/shnplug/Makefile
--- a/src/shnplug/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/shnplug/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,4 +1,4 @@
-PLUGIN = libshnplug$(PLUGIN_SUFFIX)
+PLUGIN = libshnplug${PLUGIN_SUFFIX}
 
 SRCS = array.c		\
        convert.c	\
@@ -17,13 +17,13 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := ${plugindir}/$(INPUT_PLUGIN_DIR)
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS)
-LDFLAGS += $(AUDLDFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(MOWGLI_CFLAGS) \
-	    $(PANGO_CFLAGS) $(ARCH_DEFINES) $(SIMD_CFLAGS) -I../../intl -I../.. -Wall
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+CFLAGS += ${PLUGIN_CFLAGS}
+LDFLAGS += ${AUDLDFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${PICFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} \
+	    ${PANGO_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../../intl -I../.. -Wall
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
 
 # These were the additional link flags in the old Makefile:
-# -L/opt/local/lib -L$(plugindir) -laudid3tag -Wl,-rpath=$(plugindir)
+# -L/opt/local/lib -L${plugindir} -laudid3tag -Wl,-rpath=${plugindir}
diff -r 6d33dffd1382 -r 03a2bb1c521e src/sun/Makefile
--- a/src/sun/Makefile	Thu Oct 11 17:40:42 2007 +0300
+++ b/src/sun/Makefile	Thu Oct 11 17:46:49 2007 +0300
@@ -1,4 +1,4 @@
-PLUGIN = sun$(PLUGIN_SUFFIX)
+PLUGIN = sun${PLUGIN_SUFFIX}
 
 SRCS =	sun.c	    \
 	audio.c	    \
@@ -10,8 +10,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := ${plugindir}/$(OUTPUT_PLUGIN_DIR)
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
-CFLAGS += $(PLUGIN_CFLAGS)
-CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
-LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+CFLAGS += ${PLUGIN_CFLAGS}
+CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}