summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2013-09-11 21:32:39 +0200
committerBent Bisballe Nyeng <deva@aasimon.org>2013-09-11 21:32:39 +0200
commit9883fb4fc232ebdea44dcf7b015499d31f999695 (patch)
tree8647ebdad2d2c3423eafeaf25181357ec2241b7c
parent2d44ba23037e6d37dfdf2fa40cde2d3efb6eb8c2 (diff)
Revert png static link hack (that didn't work as intended anyway...)
-rw-r--r--lv2/Makefile.am2
-rw-r--r--plugingui/Makefile.am.plugingui2
2 files changed, 2 insertions, 2 deletions
diff --git a/lv2/Makefile.am b/lv2/Makefile.am
index d3c722b..ff543b6 100644
--- a/lv2/Makefile.am
+++ b/lv2/Makefile.am
@@ -29,7 +29,7 @@ drumgizmo_la_SOURCES = \
input_lv2.cc \
output_lv2.cc
-drumgizmo_la_LDFLAGS = -module -avoid-version -Wl,-Bstatic,-lpng,-Bdynamic
+drumgizmo_la_LDFLAGS = -module -avoid-version
drumgizmo_la_LIBADD = $(LV2_LIBS) $(PLUGIN_GUI_LIBS) $(DRUMGIZMO_LIBS)
endif
diff --git a/plugingui/Makefile.am.plugingui b/plugingui/Makefile.am.plugingui
index 1913467..4679eb0 100644
--- a/plugingui/Makefile.am.plugingui
+++ b/plugingui/Makefile.am.plugingui
@@ -33,4 +33,4 @@ PLUGIN_GUI_SOURCES = \
PLUGIN_GUI_LIBS = $(X11_LIBS) $(PTHREAD_LIBS)
-PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PTHREAD_CFLAGS)
+PLUGIN_GUI_CFLAGS = $(X11_CFLAGS) $(PNG_CFLAGS) -I$(top_srcdir)/hugin -DWITH_HUG_SYSLOG -DWITH_HUG_MUTEX $(PNG_LIBS) $(PTHREAD_CFLAGS)