# HG changeset patch # User mf0102 <0102@gmx.at> # Date 1208879028 -7200 # Node ID 2d1e18c97154a35f563471c06b541025bbd8cdc5 # Parent 3429239e22e7e5674d0f2873a4a04b4d5e75e523 indentation diff -r 3429239e22e7 -r 2d1e18c97154 src/audacious/Makefile --- a/src/audacious/Makefile Tue Apr 22 14:24:40 2008 +0200 +++ b/src/audacious/Makefile Tue Apr 22 17:43:48 2008 +0200 @@ -160,36 +160,36 @@ pre-depend: ${DBUS_BINDINGS} CPPFLAGS += -DHAVE_CONFIG_H \ - ${MOWGLI_CFLAGS} \ - ${GLIB_CFLAGS} \ - ${GTHREAD_CFLAGS} \ - ${GTK_CFLAGS} \ - ${AUDACIOUS_DEFINES} \ - ${ARCH_DEFINES} \ - ${DBUS_CFLAGS} \ - ${SAMPLERATE_CFLAGS} \ - ${REGEX_CFLAGS} \ - ${LIBMCS_CFLAGS} \ - ${SIMD_CFLAGS} \ - -D_AUDACIOUS_CORE \ - -I../libSAD \ - ${EGGSM_CFLAGS} \ - -I.. -I../.. \ - -I./intl + ${MOWGLI_CFLAGS} \ + ${GLIB_CFLAGS} \ + ${GTHREAD_CFLAGS} \ + ${GTK_CFLAGS} \ + ${AUDACIOUS_DEFINES} \ + ${ARCH_DEFINES} \ + ${DBUS_CFLAGS} \ + ${SAMPLERATE_CFLAGS} \ + ${REGEX_CFLAGS} \ + ${LIBMCS_CFLAGS} \ + ${SIMD_CFLAGS} \ + -D_AUDACIOUS_CORE \ + -I../libSAD \ + ${EGGSM_CFLAGS} \ + -I.. -I../.. \ + -I./intl -LIBS += ${LDADD} \ - ${LIBINTL} \ - ${SAMPLERATE_LIBS} \ - ../libguess/libguess.a \ - ../libSAD/libSAD.a \ - ${EGGSM_LIBS} \ - ${GLIB_LIBS} \ - ${GTHREAD_LIBS} \ - ${GTK_LIBS} \ - ${DBUS_LIBS} \ - ${MOWGLI_LIBS} \ - ${LIBMCS_LIBS} \ - ${REGEX_LIBS} +LIBS += ${LDADD} \ + ${LIBINTL} \ + ${SAMPLERATE_LIBS} \ + ../libguess/libguess.a \ + ../libSAD/libSAD.a \ + ${EGGSM_LIBS} \ + ${GLIB_LIBS} \ + ${GTHREAD_LIBS} \ + ${GTK_LIBS} \ + ${DBUS_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBMCS_LIBS} \ + ${REGEX_LIBS} LDFLAGS += ${PROG_IMPLIB_LDFLAGS} diff -r 3429239e22e7 -r 2d1e18c97154 src/audtool/Makefile --- a/src/audtool/Makefile Tue Apr 22 14:24:40 2008 +0200 +++ b/src/audtool/Makefile Tue Apr 22 17:43:48 2008 +0200 @@ -1,5 +1,5 @@ PROG = audtool -SRCS = audtool_main.c \ +SRCS = audtool_main.c \ audtool_handlers_general.c \ audtool_handlers_playback.c \ audtool_handlers_playlist.c \ @@ -12,12 +12,14 @@ include ../../extra.mk CPPFLAGS += ${CFLAGS} -I.. -I../.. -I../intl -CFLAGS += ${GTK_CFLAGS} \ - ${DBUS_CFLAGS} \ - ${AUDACIOUS_DEFINES} \ - ${ARCH_DEFINES} \ - ${MOWGLI_CFLAGS} -LIBS += ${DBUS_LIBS} \ +CFLAGS += ${GTK_CFLAGS} \ + ${DBUS_CFLAGS} \ + ${AUDACIOUS_DEFINES} \ + ${ARCH_DEFINES} \ + ${MOWGLI_CFLAGS} + +LIBS += ${DBUS_LIBS} \ -L../libaudclient -laudclient \ - ${GTK_LIBS} \ - ${MOWGLI_LIBS} + ${GTK_LIBS} \ + ${MOWGLI_LIBS} \ + ${LIBMCS_LIBS}