diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | base/gs.mak | 4 | ||||
| -rw-r--r-- | base/unix-gcc.mak | 2 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | psi/msvc.mak | 2 |
5 files changed, 5 insertions, 13 deletions
diff --git a/Makefile.in b/Makefile.in index d5f9972d4..5b632c197 100644 --- a/Makefile.in +++ b/Makefile.in @@ -205,7 +205,7 @@ PCL_TARGET=@PCL_TARGET@ XPS_TARGET=@XPS_TARGET@ GPDL_TARGET=@GPDL_TARGET@ -PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET) @GPDL_TARGET_VAR@ +PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET) # Define the directories for debugging and profiling binaries, relative to # the standard binaries. diff --git a/base/gs.mak b/base/gs.mak index f9674d6dd..a6bc6dae6 100644 --- a/base/gs.mak +++ b/base/gs.mak @@ -269,10 +269,10 @@ gconfigd_h=$(GLGENDIR)$(D)gconfigd.h iconfxx_h=$(GLGENDIR)$(D)iconfxx.h iconfig_h=$(GLGENDIR)$(D)iconfig.h -all default : $(GS_XE) $(PCL_XPS_TARGETS) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(GS_MAK) $(MAKEDIRS) +all default : $(GS_XE) $(PCL_XPS_PDL_TARGETS) $(GS_SHARED_OBJS) $(MAKEDIRSTOP) $(GS_MAK) $(MAKEDIRS) $(NO_OP) -experimental: all $(GPDL_TARGET) +experimental: all $(NO_OP) # the distclean and maintainer-clean targets (if any) diff --git a/base/unix-gcc.mak b/base/unix-gcc.mak index 99c2caa36..ae85c06cf 100644 --- a/base/unix-gcc.mak +++ b/base/unix-gcc.mak @@ -178,7 +178,7 @@ GPDL=gpdl XE= XEAUX= -PCL_XPS_TARGETS= +PCL_XPS_PDL_TARGETS= # Define the directories for debugging and profiling binaries, relative to # the standard binaries. diff --git a/configure.ac b/configure.ac index 9f353e56e..b4dfe0a09 100644 --- a/configure.ac +++ b/configure.ac @@ -2299,14 +2299,6 @@ AC_SUBST(GPDL_TARGET) AC_SUBST(GPDL_MAK) -AC_ARG_ENABLE([gpdl], AC_HELP_STRING([--enable-gpdl], - [Add gpdl to the default make target list]), -[ - GPDL_TARGET_VAR="\$(GPDL_TARGET)" -]) - -AC_SUBST(GPDL_TARGET_VAR) - dnl do we compile the postscript initialization files into Ghostscript? COMPILE_INITS="1" AC_ARG_ENABLE([compile-inits], AC_HELP_STRING([--disable-compile-inits], diff --git a/psi/msvc.mak b/psi/msvc.mak index 187e09c41..5500d43fd 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -291,7 +291,7 @@ XPS_TARGET=gxps GPDL_TARGET=gpdl !endif -PCL_XPS_TARGETS=$(PCL_TARGET) $(XPS_TARGET) +PCL_XPS_PDL_TARGETS=$(PCL_TARGET) $(XPS_TARGET) $(GPDL_TARGET) # Define the root directory for Ghostscript installation. |