X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=makefile;h=7dec6041355e36b829cf909673838a9b2e384a34;hb=ffda75d2ef502efa2879bfbae966e24a3dd91d5c;hp=fb14b4d31a614e8d32e1eb60f934ff2a3726c532;hpb=5be9819351adc30537e01f34f5bf8bff28350e0e;p=wmpus diff --git a/makefile b/makefile index fb14b4d..7dec604 100644 --- a/makefile +++ b/makefile @@ -1,11 +1,9 @@ # wmpus - cross platofrm window manager # See LICENSE file for copyright and license details. -undefine CC - -include config.mk -VERSION ?= 0.1 +VERSION ?= 0.1-rc1 WM ?= wmii SYS ?= x11 CFLAGS ?= -g -Wall @@ -13,15 +11,14 @@ 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 ?= i486-mingw32-gcc PROG ?= wmpus.exe -CFLAGS += -D_MODE_T_ LDFLAGS += -lgdi32 endif @@ -43,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