summaryrefslogtreecommitdiff
path: root/x11-wm/wmanager/files/patch-aa
blob: 6dfbf13c58ae5b9ee8c6d194b9eda41a27418e25 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
$FreeBSD$

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