From 67c51cac9493f5684775cc1266765cdb35a4cae8 Mon Sep 17 00:00:00 2001 From: Jeroen Ooms Date: Fri, 9 Nov 2018 00:16:46 +0100 Subject: [PATCH] Link against $LIBS --- NEWS | 1 + src/Makevars | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/NEWS b/NEWS index 5dd4bb2..090d7d4 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 1.3 - Fix for sys 2.0 (do not quote arg on Windows) + - Link unrtf executable with $(LIBS) hopefully fixes Solaris 1.2 - Fix format-truncation warning in GCC-7 diff --git a/src/Makevars b/src/Makevars index 3f674f1..b4bb1b7 100644 --- a/src/Makevars +++ b/src/Makevars @@ -8,16 +8,13 @@ LIBUNRTF = \ UNRTF = unrtf$(WIN) -# On OSX we need to link iconv -MACFLAGS = $(subst -framework,-liconv -framework,$(FOUNDATION_LIBS)) - # On Windows we need to link Riconv and winsock WINFLAGS = $(subst 64,-lws2_32 $(LIBR) -lRiconv,$(subst 32,64,$(WIN))) all: clean $(UNRTF) $(UNRTF): $(LIBUNRTF) - $(CC) $(CFLAGS) -o $(UNRTF) $(LIBUNRTF) $(MACFLAGS) $(WINFLAGS) + $(CC) $(CFLAGS) -o $(UNRTF) $(LIBUNRTF) $(MACFLAGS) $(WINFLAGS) $(LIBS) mkdir -p $(INSTDIR)/bin cp -f $(UNRTF) $(INSTDIR)/bin/ cp -Rf share $(INSTDIR)/