ghostscript: Update to 9.20
This commit is contained in:
@@ -241,7 +241,7 @@
|
||||
$(CCAUX_) $(GENOPT) $(CFLAGS) $(I_)$(GLSRCDIR)$(_I) $(I_)$(GLOBJ)$(_I) $(I_)$(ZSRCDIR)$(_I) $(GLSRC)mkromfs.c $(O_)$(MKROMFS_XE)_1 $(MKROMFS_OBJS_1) $(AUXEXTRALIBS)
|
||||
--- a/base/unix-dll.mak
|
||||
+++ b/base/unix-dll.mak
|
||||
@@ -35,17 +35,38 @@
|
||||
@@ -35,7 +35,12 @@
|
||||
# Shared object names
|
||||
|
||||
# simple loader (no support for display device)
|
||||
@@ -255,6 +255,9 @@
|
||||
GSSOC_XE=$(BINDIR)/$(GSSOC_XENAME)
|
||||
GSSOC=$(BINDIR)/$(GSSOC_XENAME)
|
||||
|
||||
@@ -52,12 +52,28 @@
|
||||
GPDLSOC=$(BINDIR)/$(GPDLSOC_XENAME)
|
||||
|
||||
# loader suporting display device using Gtk+
|
||||
-GSSOX_XENAME=$(GS_SO_BASE)x$(XE)
|
||||
+ifeq ($(MINGW_WITH_WINLIB_NAMES), 1)
|
||||
@@ -281,10 +284,10 @@
|
||||
+ GS_SONAME_BASE=lib$(GS_SO_BASE)
|
||||
+ GS_SONAME_LINK=$(GS_SO_BASE)
|
||||
+endif
|
||||
|
||||
# GNU/Linux
|
||||
GS_SOEXT=$(SO_LIB_EXT)
|
||||
@@ -82,30 +103,30 @@
|
||||
PCL_SONAME_BASE=lib$(PCL_SO_BASE)
|
||||
XPS_SONAME_BASE=lib$(XPS_SO_BASE)
|
||||
GPDL_SONAME_BASE=lib$(GPDL_SO_BASE)
|
||||
@@ -140,13 +140,13 @@
|
||||
|
||||
# Create symbolic links to the Ghostscript interpreter library
|
||||
|
||||
@@ -301,30 +304,34 @@
|
||||
+ $(RM_) $(GS_SO_MAJOR_MINOR)
|
||||
+ ln -s $(GS_SONAME_MAJOR) $(GS_SO_MAJOR_MINOR)
|
||||
|
||||
so-links-subtarget: $(GS_SO) $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
$(NO_OP)
|
||||
$(PCL_SO): $(PCL_SO_MAJOR) $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
$(RM_) $(PCL_SO)
|
||||
@@ -212,12 +212,12 @@
|
||||
|
||||
# Build the small Ghostscript loaders, with Gtk+ and without
|
||||
$(GSSOC_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
$(GSSOC_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
- $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)dxmainc.c \
|
||||
- -L$(BINDIR) -l$(GS_SO_BASE)
|
||||
+ $(GLCC) -g -o $(GSSOC_XE) $(PSSRC)$(SOC_LOADER_PLAIN) \
|
||||
+ -L$(BINDIR) -l$(GS_SONAME_LINK)
|
||||
|
||||
$(GSSOX_XE): so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
$(GSSOX_XE): gs-so-links-subtarget $(PSSRC)$(SOC_LOADER) $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
$(GLCC) -g $(SOC_CFLAGS) -o $(GSSOX_XE) $(PSSRC)$(SOC_LOADER) \
|
||||
- -L$(BINDIR) -l$(GS_SO_BASE) $(SOC_LIBS)
|
||||
+ -L$(BINDIR) -l$(GS_SONAME_LINK) $(SOC_LIBS)
|
||||
|
||||
# ------------------------- Recursive make targets ------------------------- #
|
||||
|
||||
$(PCLSOC_XE): gpcl6-so-links-subtarget $(PLSRC)$(REALMAIN_SRC).c $(UNIX_DLL_MAK) $(MAKEDIRS)
|
||||
$(GLCC) -g -o $(PCLSOC_XE) $(PLSRC)$(REALMAIN_SRC).c -L$(BINDIR) -l$(PCL_SO_BASE)
|
||||
@@ -222,7 +222,7 @@
|
||||
SODEFS=\
|
||||
- GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR)\
|
||||
GS_DOT_O= \
|
||||
REALMAIN_OBJ= \
|
||||
- GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR_MINOR) \
|
||||
+ GS_XE=$(BINDIR)/$(GS_SONAME_MAJOR)\
|
||||
DISPLAY_DEV=$(DD)display.dev\
|
||||
STDIO_IMPLEMENTATION=c\
|
||||
BUILDDIRPREFIX=$(BUILDDIRPREFIX)
|
||||
@@ -179,11 +200,17 @@
|
||||
GPCL_XE=$(BINDIR)/$(PCL_SONAME_MAJOR_MINOR) \
|
||||
GXPS_XE=$(BINDIR)/$(XPS_SONAME_MAJOR_MINOR) \
|
||||
GPDL_XE=$(BINDIR)/$(GPDL_SONAME_MAJOR_MINOR) \
|
||||
@@ -313,11 +313,17 @@
|
||||
-mkdir -p $(DESTDIR)$(gsincludedir)
|
||||
$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
|
||||
$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
|
||||
|
||||
Reference in New Issue
Block a user