Mercurial > audlegacy-plugins
changeset 1851:224ae16453ef
Automated merge with ssh://hg.atheme.org//hg/audacious-plugins
| author | William Pitcock <nenolod@atheme.org> |
|---|---|
| date | Mon, 24 Sep 2007 14:19:48 -0500 |
| parents | e0f6efc6b08c (diff) 67f2286e2f12 (current diff) |
| children | a8667b6b6cd8 |
| files | |
| diffstat | 3 files changed, 27 insertions(+), 58 deletions(-) [+] |
line wrap: on
line diff
--- a/src/lastfm/Makefile Mon Sep 24 21:15:13 2007 +0200 +++ b/src/lastfm/Makefile Mon Sep 24 14:19:48 2007 -0500 @@ -1,25 +1,12 @@ -include ../../mk/rules.mk -include ../../mk/init.mk - -SUBDIRS = +PLUGIN = lastfm$(PLUGIN_SUFFIX) +plugindir = audacious/$(TRANSPORT_PLUGIN_DIR) -OBJECTIVE_LIBS = liblastfm$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR) - -LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CURL_LIBS) - -SOURCES = lastfm.c +SRCS = lastfm.c -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(CURL_CFLAGS) -I../../intl -I../.. -ggdb -g3 +include ../../buildsys.mk +include ../../extra.mk -CFLAGS += -Wall -pedantic -std=c99 $(GCC42_CFLAGS) -#CFLAGS += -Wpointer-arith -Wimplicit -Wnested-externs -Wcast-align \ -#-Wcast-qual -Wstrict-prototypes -Wmissing-prototypes \ -#-Wmissing-declarations -W -Wno-unused -Wshadow -Wmissing-noreturn \ -#-Wundef -Wpacked -Wnested-externs -Wbad-function-cast -Wredundant-decls \ -#-Wfloat-equal -Wdisabled-optimization -pedantic -std=c99 - -OBJECTS = ${SOURCES:.c=.o} - -include ../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \ + $(CURL_CFLAGS) -I../../intl -I../.. -Wall +LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(CURL_LIBS)
--- a/src/mms/Makefile Mon Sep 24 21:15:13 2007 +0200 +++ b/src/mms/Makefile Mon Sep 24 14:19:48 2007 -0500 @@ -1,18 +1,12 @@ -include ../../mk/rules.mk -include ../../mk/init.mk +PLUGIN = mms$(PLUGIN_SUFFIX) +plugindir = audacious/$(TRANSPORT_PLUGIN_DIR) -OBJECTIVE_LIBS = libmms$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR) - -SOURCES = mms.c +SRCS = mms.c -OBJECTS = ${SOURCES:.c=.o} - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(MMS_CFLAGS) $(ARCH_DEFINES) -I../../intl -I../.. +include ../../buildsys.mk +include ../../extra.mk -CXXFLAGS = $(CFLAGS) - -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(MMS_LIBS) - -include ../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \ + $(MMS_CFLAGS) -I../../intl -I../.. -Wall +LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(MMS_LIBS)
--- a/src/neon/Makefile Mon Sep 24 21:15:13 2007 +0200 +++ b/src/neon/Makefile Mon Sep 24 14:19:48 2007 -0500 @@ -1,24 +1,12 @@ -include ../../mk/rules.mk -include ../../mk/init.mk - -SUBDIRS = +PLUGIN = neon$(PLUGIN_SUFFIX) +plugindir = audacious/$(TRANSPORT_PLUGIN_DIR) -OBJECTIVE_LIBS = libneonsrc$(SHARED_SUFFIX) - -LIBDIR = $(plugindir)/$(TRANSPORT_PLUGIN_DIR) - -LIBADD += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(NEON_LIBS) +SRCS = neon.c rb.c -SOURCES = neon.c rb.c - -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(BEEP_DEFINES) $(NEON_CFLAGS) -I../../intl -I../.. +include ../../buildsys.mk +include ../../extra.mk -#CFLAGS += -Wpointer-arith -Wimplicit -Wnested-externs -Wcast-align \ -#-Wcast-qual -Wstrict-prototypes -Wmissing-prototypes \ -#-Wmissing-declarations -W -Wno-unused -Wshadow -Wmissing-noreturn \ -#-Wundef -Wpacked -Wnested-externs -Wbad-function-cast -Wredundant-decls \ -#-Wfloat-equal -Wdisabled-optimization -pedantic -std=c99 - -OBJECTS = ${SOURCES:.c=.o} - -include ../../mk/objective.mk +CFLAGS += $(PLUGIN_CFLAGS) +CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(XML_CPPFLAGS) \ + $(NEON_CFLAGS) -I../../intl -I../.. -Wall +LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(XML_LIBS) $(NEON_LIBS)