few compile fixes; added mono2stereo into tarball

7 files changed, 13 insertions, 28 deletions

diff --git a/plugins/ao/main.c b/plugins/ao/main.c
index 18067410..a4da36d0 100644
--- a/plugins/ao/main.c
+++ b/plugins/ao/main.c
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 #include "ao.h"
 #include "eng_protos.h"
diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c
index 65b3e1c8..dee8c4a6 100644
--- a/plugins/ao/plugin.c
+++ b/plugins/ao/plugin.c
@@ -18,7 +18,7 @@
 */
 #include <stdlib.h>
 #include <string.h>
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 #include "ao.h"
 #include "eng_protos.h"
 
diff --git a/plugins/dumb/cdumb.c b/plugins/dumb/cdumb.c
index f947d94a..0ae7f4d4 100644
--- a/plugins/dumb/cdumb.c
+++ b/plugins/dumb/cdumb.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include "dumb.h"
 #include "internal/it.h"
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }
 #define trace(fmt,...)
diff --git a/plugins/mono2stereo/Makefile b/plugins/mono2stereo/Makefile
deleted file mode 100644
index 0dceaa3a..00000000
--- a/plugins/mono2stereo/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-CC?=gcc
-
-CFLAGS+=-Wall -fPIC -D_GNU_SOURCE -std=c99
-
-LDFLAGS+=-module -shared -lm
-
-SOURCES=mono2stereo.c
-
-OBJECTS=$(SOURCES:.c=.o)
-
-OUT?=ddb_mono2stereo.so
-
-all: $(SOURCES) $(OUT)
-
-$(OUT): $(OBJECTS)
-	$(CC) $(LDFLAGS) $(OBJECTS) -o $@
-
-.c.o:
-	$(CC) $(CFLAGS) $< -c -o $@
-
-clean:
-	rm $(OBJECTS) $(OUT)
-
diff --git a/plugins/mono2stereo/Makefile.am b/plugins/mono2stereo/Makefile.am
new file mode 100644
index 00000000..ccbbf846
--- /dev/null
+++ b/plugins/mono2stereo/Makefile.am
@@ -0,0 +1,8 @@
+if HAVE_MONO2STEREO
+pkglib_LTLIBRARIES = ddb_mono2stereo.la
+ddb_mono2stereo_la_SOURCES = mono2stereo.c
+ddb_mono2stereo_la_LDFLAGS = -module
+
+ddb_mono2stereo_la_LIBADD = $(LDADD)
+AM_CFLAGS = $(CFLAGS) -std=c99
+endif
diff --git a/plugins/mono2stereo/mono2stereo.c b/plugins/mono2stereo/mono2stereo.c
index 23d0b0d5..66168bed 100644
--- a/plugins/mono2stereo/mono2stereo.c
+++ b/plugins/mono2stereo/mono2stereo.c
@@ -19,7 +19,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 
 enum {
     M2S_PARAM_LEFTMIX,
diff --git a/plugins/shn/shn.c b/plugins/shn/shn.c
index 504f283c..c9d4acaf 100644
--- a/plugins/shn/shn.c
+++ b/plugins/shn/shn.c
@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "shorten.h"
-#include <deadbeef/deadbeef.h>
+#include "../../deadbeef.h"
 #include "bitshift.h"
 
 //#define trace(...) { fprintf(stderr, __VA_ARGS__); }