$NetBSD: patch-at,v 1.1.1.1 2000/05/07 02:04:35 jlam Exp $ --- src/unix-gcc.mak.orig Mon May 1 22:07:38 2000 +++ src/unix-gcc.mak Mon May 1 22:08:39 2000 @@ -58,7 +58,7 @@ INSTALL_PROGRAM = $(INSTALL) -m 755 INSTALL_DATA = $(INSTALL) -m 644 -prefix = /usr/local +prefix = ${PREFIX} exec_prefix = $(prefix) bindir = $(exec_prefix)/bin scriptdir = $(bindir) @@ -69,8 +69,8 @@ gsdir = $(datadir)/ghostscript gsdatadir = $(gsdir)/$(GS_DOT_VERSION) -docdir=$(gsdatadir)/doc -exdir=$(gsdatadir)/examples +docdir=$(datadir)/doc/ghostscript +exdir=$(datadir)/examples/ghostscript vfdir=$(gsdatadir)/vflib GS_DOCDIR=$(docdir) @@ -156,7 +156,7 @@ # what its name is. # See gs.mak and Make.htm for more information. -SHARE_LIBPNG=0 +SHARE_LIBPNG=1 LIBPNG_NAME=png # Define the directory where the zlib sources are stored. @@ -168,7 +168,7 @@ # what its name is (usually libz, but sometimes libgz). # See gs.mak and Make.htm for more information. -SHARE_ZLIB=0 +SHARE_ZLIB=1 #ZLIB_NAME=gz ZLIB_NAME=z @@ -214,9 +214,9 @@ # We don't include -ansi, because this gets in the way of the platform- # specific stuff that typically needs; nevertheless, we expect # gcc to accept ANSI-style function prototypes and function definitions. -XCFLAGS= +#XCFLAGS= -CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) +#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS) # Define platform flags for ld. # SunOS 4.n may need -Bstatic. @@ -225,9 +225,9 @@ # -R /usr/local/xxx/lib:/usr/local/lib # giving the full path names of the shared library directories. # XLDFLAGS can be set from the command line. -XLDFLAGS= +#XLDFLAGS= -LDFLAGS=$(XLDFLAGS) -fno-common +LDFLAGS=$(XLDFLAGS) # -fno-common # Define any extra libraries to link into the executable. # ISC Unix 2.2 wants -linet. @@ -244,8 +244,11 @@ # include pthreads in libc and don't require any additional library. # All reasonable platforms require -lm, but Rhapsody and perhaps one or # two others fold libm into libc and don't require any additional library. +# +# If async device drivers won't be built, then -lpthread (or local equivalent) +# can be removed from STDLIBS. -STDLIBS=-lpthread -lm +STDLIBS=-lm # Define the include switch(es) for the X11 header files. # This can be null if handled in some other way (e.g., the files are @@ -255,7 +258,7 @@ # Note that x_.h expects to find the header files in $(XINCLUDE)/X11, # not in $(XINCLUDE). -XINCLUDE=-I/usr/local/X/include +#XINCLUDE=-I/usr/local/X/include # Define the directory/ies and library names for the X11 library files. # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH @@ -270,9 +273,16 @@ #XLIBS=Xt SM ICE Xext X11 #XLIBDIRS=-L/usr/local/X/lib -XLIBDIRS=-L/usr/X11/lib +#XLIBDIRS=-L/usr/X11/lib +#XLIBDIR= +#XLIBS=Xt Xext X11 + +.if defined(USE_X11) +XINCLUDE=-I${X11BASE}/include +XLIBDIRS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib XLIBDIR= -XLIBS=Xt Xext X11 +XLIBS=Xt SM ICE Xext X11 +.endif # Define the directory/ies for the VFlib files. # If you use FreeType, Add ttf to VFLIBS @@ -281,7 +291,7 @@ #VFLIBS=VFlib VFINCLUDE= VFLIBDIRS= -VFLIBS=VFlib2 ttf +VFLIBS=VFlib2 ttf intl # Define whether this platform has floating point hardware: # FPU_TYPE=2 means floating point is faster than fixed point. @@ -292,7 +302,7 @@ # FPU_TYPE=-1 means that floating point is always much slower than # fixed point. -FPU_TYPE=1 +#FPU_TYPE=1 # Define the .dev module that implements thread and synchronization # primitives for this platform. @@ -339,7 +349,7 @@ # Choose the device(s) to include. See devs.mak for details, # devs.mak and contrib.mak for the list of available devices. -DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev +#DEVICE_DEVS=$(DD)x11.dev $(DD)x11alpha.dev $(DD)x11cmyk.dev $(DD)x11gray2.dev $(DD)x11gray4.dev $(DD)x11mono.dev #DEVICE_DEVS1= #DEVICE_DEVS2= @@ -357,27 +367,27 @@ #DEVICE_DEVS14= #DEVICE_DEVS15= -DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev -DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev -DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev -DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev -DEVICE_DEVS5=$(DD)uniprint.dev -DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev -DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev -DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev -DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev -DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev -DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev -DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev -DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev -DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev -DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev - -DEVICE_DEVS16= -DEVICE_DEVS17= -DEVICE_DEVS18= -DEVICE_DEVS19= -DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev +#DEVICE_DEVS1=$(DD)bmpmono.dev $(DD)bmpgray.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16.dev $(DD)bmp256.dev $(DD)bmp16m.dev $(DD)bmp32b.dev +#DEVICE_DEVS2=$(DD)bmpamono.dev $(DD)bmpasep1.dev $(DD)bmpasep8.dev $(DD)bmpa16.dev $(DD)bmpa256.dev $(DD)bmpa16m.dev $(DD)bmpa32b.dev +#DEVICE_DEVS3=$(DD)deskjet.dev $(DD)djet500.dev $(DD)laserjet.dev $(DD)ljetplus.dev $(DD)ljet2p.dev $(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev $(DD)lj5mono.dev $(DD)lj5gray.dev +#DEVICE_DEVS4=$(DD)cdeskjet.dev $(DD)cdjcolor.dev $(DD)cdjmono.dev $(DD)cdj550.dev $(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev +#DEVICE_DEVS5=$(DD)uniprint.dev +#DEVICE_DEVS6=$(DD)bj10e.dev $(DD)bj200.dev $(DD)bjc600.dev $(DD)bjc800.dev +#DEVICE_DEVS7=$(DD)faxg3.dev $(DD)faxg32d.dev $(DD)faxg4.dev +#DEVICE_DEVS8=$(DD)pcxmono.dev $(DD)pcxgray.dev $(DD)pcx16.dev $(DD)pcx256.dev $(DD)pcx24b.dev $(DD)pcxcmyk.dev +#DEVICE_DEVS9=$(DD)pbm.dev $(DD)pbmraw.dev $(DD)pgm.dev $(DD)pgmraw.dev $(DD)pgnm.dev $(DD)pgnmraw.dev $(DD)pnm.dev $(DD)pnmraw.dev $(DD)ppm.dev $(DD)ppmraw.dev $(DD)pkm.dev $(DD)pkmraw.dev $(DD)pksm.dev $(DD)pksmraw.dev +#DEVICE_DEVS10=$(DD)tiffcrle.dev $(DD)tiffg3.dev $(DD)tiffg32d.dev $(DD)tiffg4.dev $(DD)tifflzw.dev $(DD)tiffpack.dev +#DEVICE_DEVS11=$(DD)tiff12nc.dev $(DD)tiff24nc.dev +#DEVICE_DEVS12=$(DD)psmono.dev $(DD)psgray.dev $(DD)psrgb.dev $(DD)bit.dev $(DD)bitrgb.dev $(DD)bitcmyk.dev +#DEVICE_DEVS13=$(DD)pngmono.dev $(DD)pnggray.dev $(DD)png16.dev $(DD)png256.dev $(DD)png16m.dev +#DEVICE_DEVS14=$(DD)jpeg.dev $(DD)jpeggray.dev +#DEVICE_DEVS15=$(DD)pdfwrite.dev $(DD)pswrite.dev $(DD)epswrite.dev $(DD)pxlmono.dev $(DD)pxlcolor.dev + +#DEVICE_DEVS16= +#DEVICE_DEVS17= +#DEVICE_DEVS18= +#DEVICE_DEVS19= +#DEVICE_DEVS20=$(DD)cljet5.dev $(DD)cljet5c.dev # ---------------------------- End of options --------------------------- #