From: Andy Spencer Date: Mon, 18 Jun 2012 00:23:35 +0000 (+0000) Subject: Get rid of undefine.. X-Git-Url: http://pileus.org/git/?p=wmpus;a=commitdiff_plain;h=4d7f5ec4dcc436ba1b29a0db8fe4531fccc48af8 Get rid of undefine.. In the Gnu's project omniscience, they've totally screwed everything up by adding automatic variables. Way to go Gnu project. Luckily they haven't yet added an automatic variable for GCC as they've done for CC, and since we use gcc specific features calling the variable that should be fine. --- diff --git a/makefile b/makefile index 11519b2..e854d81 100644 --- a/makefile +++ b/makefile @@ -1,8 +1,6 @@ # wmpus - cross platofrm window manager # See LICENSE file for copyright and license details. -undefine CC - -include config.mk VERSION ?= 0.1-p0 @@ -13,13 +11,13 @@ PREFIX ?= /usr/local MANPREFIX ?= ${PREFIX}/share/man ifeq ($(SYS),x11) -CC ?= gcc +GCC ?= gcc PROG ?= wmpus LDFLAGS += -lX11 -lXinerama endif ifeq ($(SYS),win32) -CC ?= i686-pc-mingw32-gcc +GCC ?= i686-pc-mingw32-gcc PROG ?= wmpus.exe LDFLAGS += -lgdi32 endif @@ -42,9 +40,9 @@ uninstall: rm -f $(DESTDIR)$(MANPREFIX)/man1/wmpus.1 $(PROG): main.o conf.o util.o sys-$(SYS).o wm-$(WM).o - $(CC) $(CFLAGS) -o $@ $+ $(LDFLAGS) + $(GCC) $(CFLAGS) -o $@ $+ $(LDFLAGS) %.o: %.c $(wildcard *.h) makefile - $(CC) $(CFLAGS) --std=gnu99 -c -o $@ $< + $(GCC) $(CFLAGS) --std=gnu99 -c -o $@ $< .PHONY: all clean dist install uninstall