diff options
| -rw-r--r-- | plugins/shellexecui/Makefile.am | 26 | ||||
| -rw-r--r-- | plugins/shellexecui/shellexecui.c | 8 | ||||
| -rwxr-xr-x | scripts/quickinstall.sh | 6 |
3 files changed, 20 insertions, 20 deletions
diff --git a/plugins/shellexecui/Makefile.am b/plugins/shellexecui/Makefile.am index a7a3c050..a0ac9de9 100644 --- a/plugins/shellexecui/Makefile.am +++ b/plugins/shellexecui/Makefile.am @@ -2,41 +2,41 @@ if HAVE_SHELLEXECUI if HAVE_GTK2 if HAVE_GTK3 -pkglib_LTLIBRARIES = shellexec_gtk2.la shellexec_gtk3.la +pkglib_LTLIBRARIES = shellexecui_gtk2.la shellexecui_gtk3.la else -pkglib_LTLIBRARIES = shellexec_gtk2.la +pkglib_LTLIBRARIES = shellexecui_gtk2.la endif else if HAVE_GTK3 -pkglib_LTLIBRARIES = shellexec_gtk3.la +pkglib_LTLIBRARIES = shellexecui_gtk3.la endif endif AM_CFLAGS = $(CFLAGS) -std=c99 -fPIC if HAVE_GTK2 -shellexec_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h -shellexec_gtk2_la_LDFLAGS = -module +shellexecui_gtk2_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h +shellexecui_gtk2_la_LDFLAGS = -module endif if HAVE_GTK3 -shellexec_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h -shellexec_gtk3_la_LDFLAGS = -module +shellexecui_gtk3_la_SOURCES = shellexecui.c interface.c support.c callbacks.c interface.h support.h callbacks.h +shellexecui_gtk3_la_LDFLAGS = -module endif if STATICLINK GTK_ROOT=@top_srcdir@/$(LIB)/gtk-2.12.12/usr -shellexec_gtk2_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 +shellexecui_gtk2_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 -shellexec_gtk2_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 +shellexecui_gtk2_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 if HAVE_GTK2 -shellexec_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) -shellexec_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) +shellexecui_gtk2_la_LIBADD = $(LDADD) $(GTK2_DEPS_LIBS) +shellexecui_gtk2_la_CFLAGS = -std=c99 $(GTK2_DEPS_CFLAGS) endif if HAVE_GTK3 -shellexec_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) -shellexec_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) +shellexecui_gtk3_la_LIBADD = $(LDADD) $(GTK3_DEPS_LIBS) +shellexecui_gtk3_la_CFLAGS = -std=c99 $(GTK3_DEPS_CFLAGS) endif endif diff --git a/plugins/shellexecui/shellexecui.c b/plugins/shellexecui/shellexecui.c index 0f979653..0898d4aa 100644 --- a/plugins/shellexecui/shellexecui.c +++ b/plugins/shellexecui/shellexecui.c @@ -397,9 +397,9 @@ static DB_misc_t plugin = { .plugin.version_major = 1, .plugin.version_minor = 0, #if GTK_CHECK_VERSION(3,0,0) - .plugin.id = "shellexec_gtk2", + .plugin.id = "shellexecui_gtk2", #else - .plugin.id = "shellexec_gtk3", + .plugin.id = "shellexecui_gtk3", #endif .plugin.name = "Shellexec GTK UI", .plugin.descr = "A GTK UI for the Shellexec plugin", @@ -426,9 +426,9 @@ static DB_misc_t plugin = { DB_plugin_t * #if GTK_CHECK_VERSION(3,0,0) -shellexec_gtk3_load (DB_functions_t *api) { +shellexecui_gtk3_load (DB_functions_t *api) { #else -shellexec_gtk2_load (DB_functions_t *api) { +shellexecui_gtk2_load (DB_functions_t *api) { #endif deadbeef = api; return DB_PLUGIN(&plugin); diff --git a/scripts/quickinstall.sh b/scripts/quickinstall.sh index be81c0fa..7fd71958 100755 --- a/scripts/quickinstall.sh +++ b/scripts/quickinstall.sh @@ -33,10 +33,10 @@ cp ./plugins/dca/.libs/dca.so /usr/local/lib/deadbeef/ cp ./plugins/aac/.libs/aac.so /usr/local/lib/deadbeef/ cp ./plugins/mms/.libs/mms.so /usr/local/lib/deadbeef/ cp ./plugins/shn/.libs/ddb_shn.so /usr/local/lib/deadbeef/ -cp ./plugins/ao/.libs/ddb_aopsf.so /usr/local/lib/deadbeef/ +cp ./plugins/ao/.libs/ddb_ao.so /usr/local/lib/deadbeef/ cp ./plugins/shellexec/.libs/shellexec.so /usr/local/lib/deadbeef/ -cp ./plugins/shellexecui/.libs/shellexec_gtk2.so /usr/local/lib/deadbeef/ -cp ./plugins/shellexecui/.libs/shellexec_gtk3.so /usr/local/lib/deadbeef/ +cp ./plugins/shellexecui/.libs/shellexecui_gtk2.so /usr/local/lib/deadbeef/ +cp ./plugins/shellexecui/.libs/shellexecui_gtk3.so /usr/local/lib/deadbeef/ cp ./plugins/dsp_libsrc/.libs/dsp_libsrc.so /usr/local/lib/deadbeef/ cp ./plugins/m3u/.libs/m3u.so /usr/local/lib/deadbeef/ cp ./plugins/ddb_input_uade2/ddb_input_uade2.so /usr/local/lib/deadbeef/ |