diff options
| -rw-r--r-- | plugins/converter/Makefile.am | 17 | ||||
| -rwxr-xr-x | scripts/portable_package_static.sh | 1 | ||||
| -rwxr-xr-x | scripts/portable_postbuild.sh | 4 |
3 files changed, 5 insertions, 17 deletions
diff --git a/plugins/converter/Makefile.am b/plugins/converter/Makefile.am index 5bab060c..70ef9013 100644 --- a/plugins/converter/Makefile.am +++ b/plugins/converter/Makefile.am @@ -1,8 +1,5 @@ if HAVE_CONVERTER -if STATICLINK -pkglib_LTLIBRARIES = converter.la converter_gtkui.la converter_gtkui.fallback.la -else pkglib_LTLIBRARIES = converter.la converter_gtkui.la convdatadir = $(libdir)/deadbeef/convpresets @@ -19,25 +16,21 @@ convdata_DATA = \ EXTRA_DIST = $(convdata_DATA) -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=@top_srcdir@/$(LIB)/gtk-2.12.12/usr -converter_gtkui_fallback_la_SOURCES = convgui.c interface.c support.c callbacks.h converter.h interface.h support.h -converter_gtkui_fallback_la_LDFLAGS = -module -converter_gtkui_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 +converter_gtkui_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 -converter_gtkui_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 +converter_gtkui_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 +else +converter_gtkui_la_LIBADD = $(LDADD) $(GTKUI_DEPS_LIBS) +converter_gtkui_la_CFLAGS = -std=c99 $(GTKUI_DEPS_CFLAGS) endif diff --git a/scripts/portable_package_static.sh b/scripts/portable_package_static.sh index 129000b2..be8c75b6 100755 --- a/scripts/portable_package_static.sh +++ b/scripts/portable_package_static.sh @@ -54,7 +54,6 @@ tar jcvf ../portable_out/build/deadbeef-$VERSION-static-i686.tar.bz2\ $PLUGDIR/dumb.so\ $PLUGDIR/converter.so\ $PLUGDIR/converter_gtkui.so\ - $PLUGDIR/converter_gtkui.fallback.so\ $PLUGDIR/convpresets\ $PLUGDIR/pulse.so\ $PLUGDIR/dsp_libsrc.so\ diff --git a/scripts/portable_postbuild.sh b/scripts/portable_postbuild.sh index 7fab1d6e..ae9b7ec1 100755 --- a/scripts/portable_postbuild.sh +++ b/scripts/portable_postbuild.sh @@ -45,10 +45,6 @@ fi if [ -f ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so ]; then cp ./plugins/gtkui/.libs/ddb_gui_GTK2.fallback.so $PLUGDIR/ fi -if [ -f ./plugins/converter/.libs/converter_gtkui.fallback.so ]; then - cp ./plugins/converter/.libs/converter_gtkui.fallback.so $PLUGDIR/ -fi - #pixmaps |