diff -urN -urN -x .svn ../vendor/wmanager/Makefile ./Makefile --- ../vendor/wmanager/Makefile 2007-12-11 12:42:04.000000000 +0200 +++ ./Makefile 2008-05-21 18:21:47.000000000 +0300 @@ -28,39 +28,39 @@ # make settings SHELL = /bin/sh MAKEFLAGS = --print-directory +PREFIX ?= /usr/local +LOCALBASE ?= /usr/local +# base settings +bindir = $(PREFIX)/bin +incdir = ./inc +srcdir = ./src +fltkinc = $(LOCALBASE)/include +x11lib = $(LOCALBASE)/lib # compiler settings -CXX = g++ -CXXFLAGS = -I$(incdir) -O2 -Wall -pedantic #-DDEBUG=1 -g3 - +CXX ?= g++ +CXXFLAGS_WARN ?= -Wall -W +CXXFLAGS_OPT ?= -O2 -fno-strict-aliasing -pipe +#CXXFLAGS_DBG ?= -g -DDEBUG +CXXFLAGS_DBG ?= +CXXFLAGS ?= ${CXXFLAGS_WARN} ${CXXFLAGS_DBG} ${CXXFLAGS_OPT} +CXXFLAGS += -I${fltkinc} -I${incdir} ${PTHREAD_CFLAGS} # linker settings -LD = g++ -LDFLAGS = -lfltk -lXext -lX11 -lm -LDDIRS = -L/usr/X11R6/lib -L/usr/lib -L/usr/local/lib - +LD = $(CXX) +LDFLAGS += -lGL -lfltk -lXext -lX11 -lm ${PTHREAD_LIBS} +LDDIRS = -L$(x11lib) # install settings -INSTALL = /usr/bin/install -INSTALL_FLAGS = --strip +INSTALL ?= install +STRIP ?= -s # documentation tool DOCTOOL = perceps DOCTOOL_FLAGS = -a -b -f -h -m -r -# base locations -prefix = /usr/local -exec_prefix = $(prefix) -bindir = $(exec_prefix)/bin - - -# include files and sources -incdir = ./inc -srcdir = ./src - - # documentational files for developer docdir = ./doc templates = $(docdir)/templates @@ -82,8 +82,7 @@ # project version VERSION = 0.1.1 - -all: wmanager TAGS +all: wmanager wmanager: $(OBJ) $(LD) -o $@ $^ $(LDDIRS) $(LDFLAGS) @@ -92,7 +91,7 @@ $(LD) -o wmanager $^ $(LDDIRS) $(LDFLAGS) -static install: wmanager - $(INSTALL) $< $(bindir)/$< + $(INSTALL) $(STRIP) $< ${DESTDIR}$(bindir)/$< clean: @rm -f $(OBJ) wmanager