fix stuff to pass make distcheck

8 files changed, 40 insertions, 34 deletions

diff --git a/Makefile.am b/Makefile.am
index 9be6eb1f..66286441 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,14 +39,14 @@ deadbeef_SOURCES =\
 	replaygain.c replaygain.h\
 	fft.c fft.h\
 	handler.c handler.h\
-	plugins/libparser/parser.c plugins/libparser/parser.h
+	strdupa.h
 	
 #	ConvertUTF/ConvertUTF.c ConvertUTF/ConvertUTF.h
 
 sdkdir = $(pkgincludedir)
 sdk_HEADERS = deadbeef.h
 
-deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(INTL_LIBS)
+deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) $(ICONV_LIB) $(DL_LIBS) -lm -lpthread $(INTL_LIBS) plugins/libparser/libparser.a
 
 AM_CFLAGS = $(DEPS_CFLAGS) -std=c99
 AM_CPPFLAGS = $(DEPS_CFLAGS)
diff --git a/plugins/aac/Makefile.am b/plugins/aac/Makefile.am
index 5a532d8f..642219b3 100644
--- a/plugins/aac/Makefile.am
+++ b/plugins/aac/Makefile.am
@@ -2,20 +2,10 @@ if HAVE_AAC
 aacpath=@top_srcdir@/plugins/aac
 aacdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = aac.la
-aac_la_SOURCES = aac.c aac_parser.c aac_parser.h\
-../libmp4ff/mp4atom.c\
-../libmp4ff/mp4ff.c\
-../libmp4ff/mp4meta.c\
-../libmp4ff/mp4sample.c\
-../libmp4ff/mp4tagupdate.c\
-../libmp4ff/mp4util.c\
-../libmp4ff/mp4ff.h\
-../libmp4ff/mp4ffint.h\
-../libmp4ff/mp4ff_int_types.h
-
+aac_la_SOURCES = aac.c aac_parser.c aac_parser.h
 aac_la_LDFLAGS = -module
 
-aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I$(aacpath)/../libmp4ff
+aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
+AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I@top_srcdir@/plugins/libmp4ff
 endif
 
diff --git a/plugins/alac/Makefile.am b/plugins/alac/Makefile.am
index 0dc48ade..da23099c 100644
--- a/plugins/alac/Makefile.am
+++ b/plugins/alac/Makefile.am
@@ -2,21 +2,12 @@ if HAVE_ALAC
 alacdir = $(libdir)/$(PACKAGE)
 pkglib_LTLIBRARIES = alac.la
 alac_la_SOURCES = alac_plugin.c\
-alac.c decomp.h demux.c demux.h stream.c stream.h\
-../libmp4ff/mp4atom.c\
-../libmp4ff/mp4ff.c\
-../libmp4ff/mp4meta.c\
-../libmp4ff/mp4sample.c\
-../libmp4ff/mp4tagupdate.c\
-../libmp4ff/mp4util.c\
-../libmp4ff/mp4ff.h\
-../libmp4ff/mp4ffint.h\
-../libmp4ff/mp4ff_int_types.h
+alac.c decomp.h demux.c demux.h stream.c stream.h
 
 alac_la_LDFLAGS = -module
 
-alac_la_LIBADD = $(LDADD) $(FAAD2_LIBS)
-AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I../libmp4ff
+alac_la_LIBADD = $(LDADD) $(FAAD2_LIBS) ../libmp4ff/libmp4ff.a
+AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING -I@top_srcdir@/plugins/libmp4ff
 endif
 
 
diff --git a/plugins/gtkui/Makefile.am b/plugins/gtkui/Makefile.am
index e5e9b70f..f39436bb 100644
--- a/plugins/gtkui/Makefile.am
+++ b/plugins/gtkui/Makefile.am
@@ -22,7 +22,6 @@ GTKUI_SOURCES =    gtkui.c gtkui.h\
 				   search.c search.h\
 				   fileman.c\
 				   pluginconf.c\
-				   ../libparser/parser.c ../libparser/parser.h\
 				   ddbtabstrip.c ddbtabstrip.h\
 				   ddbvolumebar.c ddbvolumebar.h\
 				   trkproperties.c trkproperties.h\
@@ -86,11 +85,11 @@ ddb_gui_GTK2_la_LDFLAGS = -module
 if STATICLINK
 GTK_ROOT_216=@top_srcdir@/$(LIB)/gtk-2.16.0
 
-ddb_gui_GTK2_la_LIBADD = $(LDADD) -L$(GTK_ROOT_216)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD)
+ddb_gui_GTK2_la_LIBADD = $(LDADD) -L$(GTK_ROOT_216)/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 $(SM_LIBADD) ../libparser/libparser.a
 
 ddb_gui_GTK2_la_CFLAGS = -std=c99 -I$(GTK_ROOT_216)/include/gtk-2.0 -I$(GTK_ROOT_216)/lib/gtk-2.0/include -I$(GTK_ROOT_216)/include/atk-1.0 -I$(GTK_ROOT_216)/include/cairo -I$(GTK_ROOT_216)/include/pango-1.0 -I$(GTK_ROOT_216)/include -I$(GTK_ROOT_216)/include/glib-2.0 -I$(GTK_ROOT_216)/lib/glib-2.0/include $(SM_CFLAGS)
 else
-ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) -lGLU
+ddb_gui_GTK2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) $(SM_LIBADD) -lGLU ../libparser/libparser.a
 ddb_gui_GTK2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) $(SM_CFLAGS)
 endif
 
@@ -112,6 +111,7 @@ GTKGLEXT_SOURCES = \
 	gtkglext-gtk3/gtk/gtkgl.h\
 	gtkglext-gtk3/gtk/gtkglinit.h\
 	gtkglext-gtk3/gtk/gtkglprivate.h\
+	gtkglext-gtk3/gtk/gtkglversion.h\
 	gtkglext-gtk3/gtk/gtkglwidget.h\
 	gtkglext-gtk3/gdk/gdkglconfig.c\
 	gtkglext-gtk3/gdk/gdkglconfigimpl.c\
@@ -130,12 +130,15 @@ GTKGLEXT_SOURCES = \
 	gtkglext-gtk3/gdk/gdkgldebug.h\
 	gtkglext-gtk3/gdk/gdkgldefs.h\
 	gtkglext-gtk3/gdk/gdkgldrawable.h\
+	gtkglext-gtk3/gdk/gdkglenumtypes.h\
+	gtkglext-gtk3/gdk/gdkglext-config.h\
 	gtkglext-gtk3/gdk/gdkgl.h\
 	gtkglext-gtk3/gdk/gdkglinit.h\
 	gtkglext-gtk3/gdk/gdkglprivate.h\
 	gtkglext-gtk3/gdk/gdkglquery.h\
 	gtkglext-gtk3/gdk/gdkgltokens.h\
 	gtkglext-gtk3/gdk/gdkgltypes.h\
+	gtkglext-gtk3/gdk/gdkglversion.h\
 	gtkglext-gtk3/gdk/gdkglwindow.h\
 	gtkglext-gtk3/gdk/gdkglwindowimpl.h\
 	gtkglext-gtk3/gdk/x11/gdkglconfig-x11.c\
@@ -154,7 +157,9 @@ GTKGLEXT_SOURCES = \
 	gtkglext-gtk3/gdk/x11/gdkx11glconfig.h\
 	gtkglext-gtk3/gdk/x11/gdkx11glcontext.h\
 	gtkglext-gtk3/gdk/x11/gdkx11glquery.h\
-	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h
+	gtkglext-gtk3/gdk/x11/gdkx11glwindow.h\
+	gtkglext-gtk3/gdk/gdkglext-config.h\
+	gtkglext-gtk3/gdk/gdkglversion.h
 endif
 
 GTKGLEXT_CFLAGS = -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3 -I@top_srcdir@/plugins/gtkui/gtkglext-gtk3/gdk -DGTK_GL_COMPILATION -DGDK_GL_COMPILATION
@@ -165,12 +170,12 @@ ddb_gui_GTK3_la_LDFLAGS = -module
 if STATICLINK
 GTK_ROOT_300=@top_srcdir@/$(LIB)/gtk-3.0.0
 
-ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) $(GTKGLEXT_LIBS)
+ddb_gui_GTK3_la_LIBADD = $(LDADD) -L$(GTK_ROOT_300)/lib -lgtk-3 -lgdk-3 -latk-1.0 -lgio-2.0 -lpangocairo-1.0 -lgdk_pixbuf-2.0 -lcairo-gobject -lpango-1.0 -lcairo -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -lfreetype -lfontconfig $(SM_LIBADD) $(GTKGLEXT_LIBS) ../libparser/libparser.a
 
 ddb_gui_GTK3_la_CFLAGS = -std=c99 -I$(GTK_ROOT_300)/include/gtk-3.0 -I$(GTK_ROOT_300)/include/pango-1.0 -I$(GTK_ROOT_300)/include/gio-unix-2.0/ -I$(GTK_ROOT_300)/include/atk-1.0 -I$(GTK_ROOT_300)/include/cairo -I$(GTK_ROOT_300)/include/gdk-pixbuf-2.0 -I$(GTK_ROOT_300)/include/freetype2 -I$(GTK_ROOT_300)/include/glib-2.0 -I$(GTK_ROOT_300)/lib/glib-2.0/include $(SM_CFLAGS) $(GTKGLEXT_CFLAGS)
 
 else
-ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) $(GTK_MAC_LIBS)
+ddb_gui_GTK3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) $(SM_LIBADD) $(GTKGLEXT_LIBS) $(GTK_MAC_LIBS) ../libparser/libparser.a
 ddb_gui_GTK3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) $(SM_CFLAGS) $(GTKGLEXT_CFLAGS) $(GTK_MAC_CFLAGS)
 endif
 endif
@@ -182,7 +187,7 @@ GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr
 ddb_gui_GTK2_fallback_la_SOURCES = $(GTKUI_SOURCES)
 ddb_gui_GTK2_fallback_la_LDFLAGS = -module
 
-ddb_gui_GTK2_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 $(SM_LIBADD)
+ddb_gui_GTK2_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 $(SM_LIBADD) ../libparser/libparser.a
 
 ddb_gui_GTK2_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 $(SM_CFLAGS)
 
diff --git a/plugins/libmp4ff/Makefile.am b/plugins/libmp4ff/Makefile.am
new file mode 100644
index 00000000..acafaa95
--- /dev/null
+++ b/plugins/libmp4ff/Makefile.am
@@ -0,0 +1,13 @@
+noinst_LIBRARIES = libmp4ff.a
+libmp4ff_a_SOURCES = \
+	mp4atom.c\
+	mp4ff.c\
+	mp4ff.h\
+	mp4ffint.h\
+	mp4ff_int_types.h\
+	mp4meta.c\
+	mp4sample.c\
+	mp4tagupdate.c\
+	mp4util.c
+
+
diff --git a/plugins/libparser/Makefile.am b/plugins/libparser/Makefile.am
new file mode 100644
index 00000000..11ba1c3a
--- /dev/null
+++ b/plugins/libparser/Makefile.am
@@ -0,0 +1,2 @@
+noinst_LIBRARIES = libparser.a
+libparser_a_SOURCES = parser.c parser.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8ba3de5a..631d376a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -33,3 +33,5 @@ plugins/shellexecui/shellexec.glade
 plugins/gtkui/actionhandlers.c
 plugins/gtkui/ctmapping.c
 plugins/gtkui/widgets.c
+plugins/gtkui/pltmenu.c
+plugins/pltbrowser/pltbrowser.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 26f7de7d..309ee0bf 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,4 @@
 plugins/vorbis/vcedit.c
+plugins/gtkui/smclient/eggdesktopfile.c
+plugins/gtkui/smclient/eggsmclient.c
+