From 9883fb4fc232ebdea44dcf7b015499d31f999695 Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 11 Sep 2013 21:32:39 +0200 Subject: Revert png static link hack (that didn't work as intended anyway...) --- lv2/Makefile.am | 2 +- plugingui/Makefile.am.plugingui | 2 +- 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) -- cgit v1.2.3