ed992bc0b9
Include changes from 7e6d92e63e
Should deal with errors like this one:
CANNOT LINK EXECUTABLE "mutool": library "build/shared-release/libmupdf.so" not found
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
diff -uNr mupdf-1.18.0-source/Makefile mupdf-1.18.0-source.mod/Makefile
|
|
--- mupdf-1.18.0-source/Makefile 2020-10-07 13:35:03.000000000 +0300
|
|
+++ mupdf-1.18.0-source.mod/Makefile 2021-08-05 19:47:26.364131551 +0300
|
|
@@ -66,6 +66,14 @@
|
|
WINDRES_CMD = $(QUIET_WINDRES) $(MKTGTDIR) ; $(WINDRES) $< $@
|
|
OBJCOPY_CMD = $(QUIET_OBJCOPY) $(MKTGTDIR) ; $(LD) -r -b binary -z noexecstack -o $@ $<
|
|
|
|
+ifeq ($(shared),yes)
|
|
+LINK_CMD = $(QUIET_LINK) $(MKTGTDIR) ; $(CC) $(LDFLAGS) -o $@ \
|
|
+ $(filter-out %.$(SO),$^) \
|
|
+ $(sort $(patsubst %,-L%,$(dir $(filter %.$(SO),$^)))) \
|
|
+ $(patsubst lib%.$(SO),-l%,$(notdir $(filter %.$(SO),$^))) \
|
|
+ $(LIBS)
|
|
+endif
|
|
+
|
|
# --- Rules ---
|
|
|
|
$(OUT)/%.a :
|
|
@@ -321,7 +329,7 @@
|
|
$(OUT)/example: docs/examples/example.c $(MUPDF_LIB) $(THIRD_LIB)
|
|
$(LINK_CMD) $(CFLAGS) $(THIRD_LIBS)
|
|
$(OUT)/multi-threaded: docs/examples/multi-threaded.c $(MUPDF_LIB) $(THIRD_LIB)
|
|
- $(LINK_CMD) $(CFLAGS) $(THIRD_LIBS) -lpthread
|
|
+ $(LINK_CMD) $(CFLAGS) $(THIRD_LIBS)
|
|
|
|
# --- Update version string header ---
|
|
|
|
@@ -355,7 +363,7 @@
|
|
tools: $(TOOL_APPS)
|
|
apps: $(TOOL_APPS) $(VIEW_APPS)
|
|
|
|
-install: libs apps
|
|
+install: libs tools
|
|
install -d $(DESTDIR)$(incdir)/mupdf
|
|
install -d $(DESTDIR)$(incdir)/mupdf/fitz
|
|
install -d $(DESTDIR)$(incdir)/mupdf/pdf
|
|
@@ -367,7 +375,7 @@
|
|
install -m 644 $(INSTALL_LIBS) $(DESTDIR)$(libdir)
|
|
|
|
install -d $(DESTDIR)$(bindir)
|
|
- install -m 755 $(TOOL_APPS) $(VIEW_APPS) $(DESTDIR)$(bindir)
|
|
+ install -m 755 $(TOOL_APPS) $(DESTDIR)$(bindir)
|
|
|
|
install -d $(DESTDIR)$(mandir)/man1
|
|
install -m 644 docs/man/*.1 $(DESTDIR)$(mandir)/man1
|