summaryrefslogtreecommitdiff
blob: 3066b0981a1f553b8e5e2ce17ebd788e09c9d391 (plain)
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
* Respect CXX, CXXFLAGS, LDFLAGS, LIBS
* Don't strip binaries
https://bugs.gentoo.org/336099

--- a/Makefile
+++ b/Makefile
@@ -1,14 +1,9 @@
-CC       = g++
-ADDITIONAL_CFLAGS   = -g -O2 -march=i686 -Wall
-
 prefix   = /usr
-INCLUDES = -I$/usr/X11R6
-LDPATH   = -L/usr/X11R6/lib
-LIBS     = -lXext -lX11
+LIBS     += -lXext -lX11
 
 # SHAPE = Shape Extension
 # NEED_SETENV = Does your Unix not support the setenv function? Use this!
-DEFINES  = -DSHAPE #-DNEED_SETENV 
+CPPFLAGS += -DSHAPE #-DNEED_SETENV
 HEADERS  = aewm.hh 		\
 	   client.hh 		\
 	   windowmanager.hh  	\
@@ -28,14 +23,10 @@
 all: aewm++
 
 aewm++: $(OBJS)
-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
-
-$(OBJS): %.o: %.cc $(HEADERS)
-	$(CC) $(CFLAGS) $(ADDITIONAL_CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+	$(CXX) $(LDFLAGS) $(CXXFLAGS) $(OBJS) $(LIBS) -o $@
 
 install: all
-	mkdir -p $(DESTDIR)$(prefix)/bin
-	install -s aewm++ $(DESTDIR)$(prefix)/bin
+	install -D -m 755 aewm++ $(DESTDIR)$(prefix)/bin/aewm++
 	
 clean:
 	rm -f aewm++ $(OBJS) core