[Pkg-wmaker-commits] [wmbubble] 49/207: Wait, I thought I killed USER_CFLAGS! Finish the job. (also, whitespace)

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmbubble.

commit 782a1c80f88e99caa00f1447a37f97815e92d26b
Author: Robert Jacobs <rnjacobs at mit.edu>
Date:   Sat Jul 30 21:48:12 2011 -0700

    Wait, I thought I killed USER_CFLAGS! Finish the job. (also, whitespace)
---
 Makefile | 54 ++++++++++++++++++++++++++----------------------------
 1 file changed, 26 insertions(+), 28 deletions(-)

diff --git a/Makefile b/Makefile
index a92ca1d..c9dec90 100644
--- a/Makefile
+++ b/Makefile
@@ -16,46 +16,44 @@ CC = gcc
 
 # special things for Linux
 ifeq ($(OS), Linux)
-    OBJS += sys_linux.o
-    LIBS = -lX11
-    INSTALL = -m 755
+	OBJS += sys_linux.o
+	LIBS = -lX11
+	INSTALL = -m 755
 endif
 
 # special things for FreeBSD
 ifeq ($(OS), FreeBSD)
-    OBJS += sys_freebsd.o
-    LIBS = -lX11 -lkvm
-    INSTALL = -c -g kmem -m 2755 -o root
+	OBJS += sys_freebsd.o
+	LIBS = -lX11 -lkvm
+	INSTALL = -c -g kmem -m 2755 -o root
 endif
 
 # special things for OpenBSD
 ifeq ($(OS), OpenBSD)
-    OBJS += sys_openbsd.o
-    LIBS = -lX11
+	OBJS += sys_openbsd.o
+	LIBS = -lX11
 endif
 
 #special things for SunOS
 ifeq ($(OS), SunOS)
-
-    # try to detect if gcc is available (also works if you call gmake CC=cc to
-    # select the sun compilers on a system with both)
-    COMPILER=$(shell \
-        if [ `$(CC) -v 2>&1 | egrep -c '(gcc|egcs|g\+\+)'` = 0 ]; then \
-	    echo suncc; else echo gcc; fi)
-
-    # if not, fix up CC and the CFLAGS for the Sun compiler
-    ifeq ($(COMPILER), suncc)
-	CC=cc
-	USER_CFLAGS=-v -xO3
-    endif
-
-    ifeq ($(COMPILER), gcc)
-	USER_CFLAGS=-O3 -Wall
-    endif
-    CFLAGS = $(USER_CFLAGS) $(BUILD_CFLAGS) ${EXTRA}
-    OBJS += sys_sunos.o
-    LIBS = -lX11 -lkstat -lm
-    INSTALL = -m 755
+# try to detect if gcc is available (also works if you call gmake CC=cc to
+# select the sun compilers on a system with both)
+	COMPILER=$(shell \
+		if [ `$(CC) -v 2>&1 | egrep -c '(gcc|egcs|g\+\+)'` = 0 ]; then \
+		echo suncc; else echo gcc; fi)
+
+# if not, fix up CC and the CFLAGS for the Sun compiler
+	ifeq ($(COMPILER), suncc)
+		CC=cc
+		CFLAGS=-v -xO3
+	endif
+
+	ifeq ($(COMPILER), gcc)
+		CFLAGS=-O3 -Wall
+	endif
+	OBJS += sys_sunos.o
+	LIBS = -lX11 -lkstat -lm
+	INSTALL = -m 755
 endif
 
 CFLAGS += -DNAME=\"$(BINARY)\"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmbubble.git