summaryrefslogtreecommitdiff
blob: 8b84a9963469eb262d4e90693486016ae0e70e74 (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
Respect CFLAGS, LDFLAGS, don't strip binaries

http://bugs.gentoo.org/show_bug.cgi?id=336099

--- aewm++-1.1.5/Makefile
+++ aewm++-1.1.5/Makefile
@@ -1,9 +1,6 @@
 CC       = g++
-ADDITIONAL_CFLAGS   = -g -O2 -march=i686 -Wall
 
 prefix   = /usr
-INCLUDES = -I$/usr/X11R6
-LDPATH   = -L/usr/X11R6/lib
 LIBS     = -lXext -lX11
 
 # SHAPE = Shape Extension
@@ -28,14 +25,13 @@
 all: aewm++
 
 aewm++: $(OBJS)
-	$(CC) $(OBJS) $(LDPATH) $(LIBS) -o $@
+	$(CXX) $(LDFLAGS) $(OBJS) $(LDPATH) $(LIBS) -o $@
 
 $(OBJS): %.o: %.cc $(HEADERS)
-	$(CC) $(CFLAGS) $(ADDITIONAL_CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@
+	$(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< -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