added converter to main tarball/autotools distribution;

few minor fixups in soundtouch

2 files changed, 29 insertions, 32 deletions

diff --git a/plugins/converter/Makefile b/plugins/converter/Makefile
deleted file mode 100644
index 7cd742a0..00000000
--- a/plugins/converter/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-CONVERTER_OUT=converter.so
-GUI_OUT=converter_gtkui.so
-
-CC=gcc
-
-CFLAGS+=-Wall -D_GNU_SOURCE -std=c99 -fPIC -g -I../..
-
-LDFLAGS+=-module -shared
-
-CONVERTER_SOURCES=converter.c
-GUI_SOURCES=convgui.c interface.c support.c
-
-CONVERTER_OBJECTS=$(CONVERTER_SOURCES:.c=.o)
-GUI_OBJECTS=$(GUI_SOURCES:.c=.o)
-
-all: $(CONVERTER_SOURCES) $(CONVERTER_OUT) $(GUI_SOURCES) $(GUI_OUT)
-
-$(CONVERTER_OUT): $(CONVERTER_OBJECTS)
-	$(CC) $(LDFLAGS) $(CONVERTER_OBJECTS) -o $@
-
-GTK_CFLAGS=`pkg-config --cflags gtk+-2.0`
-GTK_LIBS=`pkg-config --libs gtk+-2.0`
-
-$(GUI_OUT): $(GUI_OBJECTS)
-	$(CC) $(LDFLAGS) $(GUI_OBJECTS) $(GTK_LIBS) -o $@
-
-.c.o:
-	$(CC) $(CFLAGS) $(GTK_CFLAGS) $< -c -o $@
-
-clean:
-	rm $(CONVERTER_OBJECTS) $(CONVERTER_OUT) $(GUI_OBJECTS) $(GUI_OUT)
-
diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am
new file mode 100644
index 00000000..72c4e19b
--- /dev/null
+++ b/plugins/converter/Makefile.am
@@ -0,0 +1,29 @@
+if HAVE_CONVERTER
+
+if STATICLINK
+pkglib_LTLIBRARIES = converter.la converter_gtkui.la convgui_fallback.la
+else
+pkglib_LTLIBRARIES = converter.la converter_gtkui.la
+endif
+
+AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC
+converter_la_SOURCES = converter.c converter.h
+converter_la_LDFLAGS = -module
+converter_gtkui_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
+converter_gtkui_la_LDFLAGS = -module
+converter_gtkui_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS)
+converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS)
+
+# fallback lib
+if STATICLINK
+GTK_ROOT=../../../deadbeef-deps/gtk-debian/usr
+convgui_fallback_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h
+convgui_fallback_la_LDFLAGS = -module
+
+convgui_fallback_la_LIBADD = $(LDADD) -L$(GTK_ROOT)/lib $(GTK_ROOT)/lib/libgtk-x11-2.0.la $(GTK_ROOT)/lib/libgdk-x11-2.0.la $(GTK_ROOT)/lib/libpangoft2-1.0.la $(GTK_ROOT)/lib/libpangocairo-1.0.la $(GTK_ROOT)/lib/libgdk_pixbuf-2.0.la -lm $(GTK_ROOT)/lib/libcairo.la $(GTK_ROOT)/lib/libpango-1.0.la $(GTK_ROOT)/lib/libgobject-2.0.la $(GTK_ROOT)/lib/libgmodule-2.0.la $(GTK_ROOT)/lib/libgthread-2.0.la -lrt $(GTK_ROOT)/lib/libglib-2.0.la
+
+convgui_fallback_la_CFLAGS = -std=c99 -I $(GTK_ROOT)/include -I $(GTK_ROOT)/lib/gtk-2.0/include -I $(GTK_ROOT)/include/glib-2.0 -I $(GTK_ROOT)/include/gtk-2.0 -I $(GTK_ROOT)/include/cairo -I $(GTK_ROOT)/lib/glib-2.0/include/ -I $(GTK_ROOT)/include/pango-1.0 -I $(GTK_ROOT)/include/atk-1.0 -DULTRA_COMPATIBLE=1
+endif
+
+
+endif