summaryrefslogtreecommitdiff
blob: 9d6e1275388c720a2db47fd6f871de28524515aa (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
--- Makefile.old	2009-02-10 12:36:39.000000000 +0100
+++ Makefile	2009-02-10 12:38:25.000000000 +0100
@@ -2,8 +2,9 @@
 PROGRAM = picpuz
 VERSION = 1.7
 SOURCE = $(PROGRAM)-$(VERSION).cpp
-CFLAGS = -O -Wall -c `pkg-config --cflags gtk+-2.0`
-LFLAGS = -O -Wall `pkg-config --libs gtk+-2.0 gthread-2.0`
+CXXFLAGS += `pkg-config --cflags gtk+-2.0` \
+	-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
+LDLIBS = `pkg-config --libs gtk+-2.0 gthread-2.0`
 LAUNCHER = $(HOME)/Desktop/$(PROGRAM).desktop
 
 # use $PREFIX if defined, else assume /usr/local
@@ -18,16 +19,10 @@
 
 
 $(PROGRAM): $(PROGRAM).o zfuncs.o
-	@g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o
+	$(LINK.cc) $^ $(LOADLIBES) $(LDLIBS) -o $@
 
 $(PROGRAM).o: $(SOURCE) zfuncs.h
-	@g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
-	-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-
-zfuncs.o: zfuncs.cpp zfuncs.h
-	@g++ $(CFLAGS) zfuncs.cpp	\
-	-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
-
+	$(COMPILE.cc) $(OUTPUT_OPTION) $<
 
 install: $(PROGRAM)
 	mkdir -p $(DESTDIR)$(DATADIR)