From a987816d4531ae9ade2d4e75a063ab2b89e271e8 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Sat, 11 May 2013 14:47:56 +0200 Subject: Added pthread to linking. Fix install path on systems that actively set the --libdir configure option (thanks falktx). --- lv2/Makefile.am | 2 +- plugingui/Makefile.am.plugingui | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lv2/Makefile.am b/lv2/Makefile.am index 95e9911..bb7cea1 100644 --- a/lv2/Makefile.am +++ b/lv2/Makefile.am @@ -9,7 +9,7 @@ INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/plugingui \ $(PLUGIN_GUI_CFLAGS) -DX11 -DSSE -msse -msse2 -msse3 \ -DUSE_THREAD -plugindir = $(libdir)/lv2/drumgizmo.lv2 +plugindir = $(prefix)/lib/lv2/drumgizmo.lv2 plugin_LTLIBRARIES = drumgizmo.la plugin_DATA = manifest.ttl drumgizmo.ttl diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui index f291428..cf7f346 100644 --- a/plugingui/Makefile.am.plugingui +++ b/plugingui/Makefile.am.plugingui @@ -31,6 +31,6 @@ PLUGIN_GUI_SOURCES = \ $(top_srcdir)/plugingui/resource.cc \ $(top_srcdir)/plugingui/resource_data.cc -PLUGIN_GUI_LIBS = $(X11_LIBS) $(PNG_LIBS) +PLUGIN_GUI_LIBS = $(X11_LIBS) $(PNG_LIBS) $(PTHREAD_LIBS) -PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX +PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS) -- cgit v1.2.3