]>
Commit | Line | Data |
---|---|---|
f9250b19 | 1 | --- fotoxx-9.7/Makefile.orig 2010-03-10 06:28:55.000000000 +0100 |
2 | +++ fotoxx-9.7/Makefile 2010-03-15 09:04:09.000000000 +0100 | |
eeae8f48 | 3 | @@ -5,8 +5,10 @@ |
4 | SOURCE = $(PROGRAM)-$(VERSION).cpp | |
5 | ||
d7ef8075 | 6 | # replace CFLAGS and LFLAGS -O3 with -g for GDB debugging |
7 | -CFLAGS = -O3 -Wall -c `pkg-config --cflags gtk+-2.0` | |
961e6e3c | 8 | -LFLAGS = -O3 -Wall -rdynamic `pkg-config --libs gtk+-2.0 gthread-2.0` |
eeae8f48 | 9 | +CFLAGS := $(OPTCFLAGS) -Wall $(shell pkg-config --cflags gtk+-2.0) |
10 | +LDFLAGS := $(OPTLDFLAGS) -rdynamic | |
11 | +LIBS := $(OPTLIBS) $(shell pkg-config --libs gtk+-2.0 gthread-2.0) -lfreeimage | |
12 | +CXX = g++ | |
13 | ||
14 | # use $PREFIX if defined, else assume /usr/local | |
15 | ifeq "$(PREFIX)" "" | |
f9250b19 | 16 | @@ -22,15 +24,15 @@ |
eeae8f48 | 17 | |
f9250b19 | 18 | $(PROGRAM): $(PROGRAM).o zfuncs.o |
eeae8f48 | 19 | @ ./dependencies.sh |
f9250b19 | 20 | - @ g++ $(LFLAGS) -lfreeimage -o $(PROGRAM) $(PROGRAM).o zfuncs.o # dynamic link |
eeae8f48 | 21 | + $(CXX) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) |
f9250b19 | 22 | # @ g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o /usr/lib/libfreeimage.a # static link |
eeae8f48 | 23 | |
24 | $(PROGRAM).o: $(SOURCE) | |
25 | - @ g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE) \ | |
26 | + $(CXX) $(CFLAGS) -c -o $@ $^ \ | |
27 | -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" | |
28 | ||
29 | zfuncs.o: zfuncs.cpp | |
30 | - @ g++ $(CFLAGS) zfuncs.cpp \ | |
31 | + $(CXX) $(CFLAGS) -c -o $@ $^ \ | |
32 | -D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\"" | |
33 | ||
34 | install: $(PROGRAM) |