mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-14 23:46:10 +00:00
00114700d0
- make configure script work (Louis) - make configure.batch script work (Andreas) - extract contributed HP8XX driver in ${WRKSRC}/src - make png driver compile (add $(PREFIX)/include to XINCLUDE variable) Dunno, if this will be the last round of cleanups... Submitted by: "Louis A. Mamakos" <louie@TransSys.COM>
180 lines
7.5 KiB
Plaintext
180 lines
7.5 KiB
Plaintext
--- src/unix-gcc.mak.orig Sat Mar 18 05:13:40 2000
|
|
+++ src/unix-gcc.mak Sat Mar 25 21:47:45 2000
|
|
@@ -52,11 +52,10 @@
|
|
# the directories also define the default search path for the
|
|
# initialization files (gs_*.ps) and the fonts.
|
|
|
|
-INSTALL = $(GLSRCDIR)/instcopy -c
|
|
-INSTALL_PROGRAM = $(INSTALL) -m 755
|
|
-INSTALL_DATA = $(INSTALL) -m 644
|
|
+INSTALL_PROGRAM = $(BSD_INSTALL_SCRIPT)
|
|
+INSTALL_DATA = $(BSD_INSTALL_DATA)
|
|
|
|
-prefix = /usr/local
|
|
+prefix = $(PREFIX)
|
|
exec_prefix = $(prefix)
|
|
bindir = $(exec_prefix)/bin
|
|
scriptdir = $(bindir)
|
|
@@ -153,7 +152,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.
|
|
@@ -165,7 +164,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
|
|
|
|
@@ -180,7 +179,7 @@
|
|
|
|
# Define the name of the C compiler.
|
|
|
|
-CC=gcc
|
|
+CC=cc
|
|
|
|
# Define the name of the linker for the final link step.
|
|
# Normally this is the same as the C compiler.
|
|
@@ -213,7 +212,7 @@
|
|
# gcc to accept ANSI-style function prototypes and function definitions.
|
|
XCFLAGS=
|
|
|
|
-CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
|
|
+#CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
|
|
|
|
# Define platform flags for ld.
|
|
# SunOS 4.n may need -Bstatic.
|
|
@@ -222,7 +221,7 @@
|
|
# -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=-L$(prefix)/lib
|
|
|
|
LDFLAGS=$(XLDFLAGS) -fno-common
|
|
|
|
@@ -242,7 +241,7 @@
|
|
# All reasonable platforms require -lm, but Rhapsody and perhaps one or
|
|
# two others fold libm into libc and don't require any additional library.
|
|
|
|
-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
|
|
@@ -252,7 +251,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$(X11BASE)/include -I$(PREFIX)/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
|
|
@@ -264,12 +263,12 @@
|
|
# Solaris and other SVR4 systems with dynamic linking probably want
|
|
#XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
|
|
# X11R6 (on any platform) may need
|
|
-#XLIBS=Xt SM ICE Xext X11
|
|
+XLIBS=Xt SM ICE Xext X11
|
|
|
|
#XLIBDIRS=-L/usr/local/X/lib
|
|
-XLIBDIRS=-L/usr/X11/lib
|
|
+XLIBDIRS=-L$(X11BASE)/lib
|
|
XLIBDIR=
|
|
-XLIBS=Xt Xext X11
|
|
+#XLIBS=Xt Xext X11
|
|
|
|
# Define whether this platform has floating point hardware:
|
|
# FPU_TYPE=2 means floating point is faster than fixed point.
|
|
@@ -327,7 +326,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=
|
|
@@ -345,27 +344,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 --------------------------- #
|
|
|
|
@@ -379,13 +378,13 @@
|
|
# detect whether we're running a version of gcc with the const optimization
|
|
# bug.
|
|
|
|
-AK=$(GLGENDIR)/cc.tr
|
|
+#AK=$(GLGENDIR)/cc.tr
|
|
|
|
# Define the compilation rules and flags.
|
|
|
|
CCFLAGS=$(GENOPT) $(CFLAGS)
|
|
-CC_=$(CC) `cat $(AK)` $(CCFLAGS)
|
|
-CCAUX=$(CC) `cat $(AK)`
|
|
+CC_=$(CC) $(CCFLAGS)
|
|
+CCAUX=$(CC)
|
|
CC_LEAF=$(CC_) -fomit-frame-pointer
|
|
# gcc can't use -fomit-frame-pointer with -pg.
|
|
CC_LEAF_PG=$(CC_)
|
|
@@ -412,5 +411,5 @@
|
|
include $(GLSRCDIR)/unixinst.mak
|
|
|
|
# This has to come last so it won't be taken as the default target.
|
|
-$(AK):
|
|
- if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
|
|
+#$(AK):
|
|
+# if ( $(CC) --version | egrep "^2\.7\.([01]|2(\.[^1-9]|$$))" >/dev/null ); then echo -Dconst= >$(AK); else echo -Wcast-qual -Wwrite-strings >$(AK); fi
|