$NetBSD: patch-aa,v 1.40 2006/06/15 11:40:00 dillo Exp $

--- makefile.unix.orig	2006-05-15 18:53:34.000000000 +0200
+++ makefile.unix
@@ -33,7 +33,7 @@
 ###########################################################################
 
 # Uncomment one of these.
-TARGET = mame
+# TARGET = mame
 # TARGET = mess
 # TARGET = mage
 # TARGET = mmsnd
@@ -97,7 +97,7 @@
 # just as well.  However, stay away from the `cc' Ultrix compiler if 
 # possible.
 
-CC	= @gcc
+# CC	= @gcc
 # CC    = @cc
 # CC	= @icc
 # CC	= @c89
@@ -118,7 +118,7 @@
 
 # If you want to use whatever CFLAGS are currently set in your 
 # environment, then comment this out.
-CFLAGS =
+# CFLAGS =
 
 
 ###########################################################################
@@ -127,7 +127,7 @@
 ###########################################################################
 
 # GCC on x86
-CFLAGS = -O2
+# CFLAGS = -O2
 
 # GCC on x86 with some optimizations
 # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
@@ -181,13 +181,13 @@
   #########################################################################
   
   # Check for C89 + GNU extensions compliance.
-  CFLAGS += -std=gnu89
+  # CFLAGS += -std=gnu89
 
   # Show all warnings.
-  CFLAGS += -Wall
+  # CFLAGS += -Wall
 
   # Don't warn about unused variables.
-  CFLAGS += -Wno-unused
+  # CFLAGS += -Wno-unused
 
   # Warn about declarations after statements.
   # CFLAGS += -Wdeclaration-after-statement
@@ -328,16 +328,16 @@
 ifeq ($(CC),icc)
 
   # Optimizations for the Intel compiler.
-  CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
+  # CFLAGS    = -O3 -rcd -Xa -ipo -ipo_obj
 
 else
 ifeq ($(CC),sun-forte)
   #
   # sun-forte given above is just an artifice to get us into this section
-  CC = cc
+  # CC = cc
 
   # uncomment to set compiler defaults oriented for maximum performance
-  XOPT += -fast
+  # XOPT += -fast
 
   # Choose one optimization level;
   #XOPT += -xO0
@@ -346,7 +346,7 @@
   #XOPT += -xO3
   # -xO4 and above automatically inline
   #XOPT += -xO4
-  XOPT += -xO5
+  # XOPT += -xO5
 
   # uncomment for code generation targeted to the local machine; this
   # supplies -xarch, -xcpu, -xtarget.  It also seems to cause an annoying
@@ -354,11 +354,11 @@
   # older hardware, which apparently can't be disabled.  As an alternative,
   # the particular -xtarget for your system could be specified; 
   # -xtarget=ultra2/2300
-  XTARGET += -native 
+  # XTARGET += -native 
   #XTARGET += -xtarget=ultra2/2300
 
   # uncomment to inline library math functions
-  EXTRA_OPTS += -xlibmil
+  # EXTRA_OPTS += -xlibmil
 
   ######################################################
   # Additional options for parallelization optimizations
@@ -374,7 +374,7 @@
 
   # Sparc only, uncomment to do loop restructuring optimizations
   # and speculative prefetch for v8plusa and above
-  EXTRA_OPTS += -xdepend  -xsafe=mem
+  # EXTRA_OPTS += -xdepend  -xsafe=mem
 
   #################################################
   # Additional options for glx builds
@@ -384,14 +384,14 @@
   # (libGLU dlopen() complains of missing name mangled symbols)
   # GLCFLAGS += -DSUN_FORTE_DLOPEN_LIBCRUN='\"libCrun.so.1\"'
 
-  CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
-  LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
+  # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
+  # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS)
 
   # uncomment for silence...
-  CFLAGS += -erroff
+  # CFLAGS += -erroff
   # Tell xmame that we really are in fact elf.  If not supplied, 
   # SHARED_PREFIX is set causing dlopen()'s to fail.
-  CFLAGS += -D__ELF__ 
+  # CFLAGS += -D__ELF__ 
 endif
 endif
 endif
@@ -614,7 +614,7 @@
 ###########################################################################
 
 # Linux 
-ARCH  = linux
+# ARCH  = linux
 
 # FreeBSD
 # ARCH  = freebsd
@@ -727,7 +727,7 @@
 # use SDL.
 
 # X11 (including Glide & OpenGL if enabled below)
-DISPLAY_METHOD = x11
+# DISPLAY_METHOD = x11
 
 # SDL library 
 # DISPLAY_METHOD = SDL
@@ -758,7 +758,7 @@
 X11_MITSHM = 1
 
 # Use Xv extension for hardware scaling.
-X11_XV = 1
+# X11_XV = 1
 
 # Enable XFree86 DGA.  This also causes "make install" to set the suid bit 
 # on the executable.
@@ -782,8 +782,8 @@
 # X11LIB		= -L/usr/lib/X11
 
 # Standard location for XFree86
-X11INC		= -I/usr/X11R6/include
-X11LIB		= -L/usr/X11R6/lib
+# X11INC		= -I/usr/X11R6/include
+# X11LIB		= -L/usr/X11R6/lib
 
 # Standard location for Sun systems
 # X11INC		= -I/usr/openwin/include