Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 367893 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile.orig (-19 / +20 lines)
Lines 1-9 Link Here
1
CC ?= gcc
2
PKG_CONFIG ?= pkg-config
1
3
2
CC=gcc
4
CFLAGS ?= -Wall -g -O3 -ansi -pedantic 
3
LD=gcc
4
5
5
CFLAGS = -Wall -c -g -O3 -ansi -pedantic `pkg-config --cflags gtk+-2.0`
6
MY_CFLAGS = $(CFLAGS) $(shell $(PKG_CONFIG) --cflags gtk+-2.0)
6
LDFLAGS = `pkg-config --libs gtk+-2.0` -lz -lpng -ljpeg
7
MY_LDFLAGS = $(LDFLAGS) $(shell $(PKG_CONFIG) --libs gtk+-2.0) $(shell $(PKG_CONFIG) --libs libpng) -ljpeg -lm
7
8
8
CFILES = main.c memory.c png.c editor.c common.c palette.c tiled.c jpg.c bmp.c string.c pcx.c prefs.c exit.c tga.c
9
CFILES = main.c memory.c png.c editor.c common.c palette.c tiled.c jpg.c bmp.c string.c pcx.c prefs.c exit.c tga.c
9
HFILES = main.h memory.h png.h editor.h common.h palette.h tiled.h jpg.h bmp.h string.h pcx.h prefs.h exit.h tga.h
10
HFILES = main.h memory.h png.h editor.h common.h palette.h tiled.h jpg.h bmp.h string.h pcx.h prefs.h exit.h tga.h
Lines 12-61 Link Here
12
13
13
14
14
all: $(OFILES) Makefile
15
all: $(OFILES) Makefile
15
	$(LD) $(LDFLAGS) $(OFILES) -o $(EXECUT) -lm ; strip $(EXECUT)
16
	$(CC) $(OFILES) -o $(EXECUT) $(MY_LDFLAGS)
16
17
17
18
18
main.o: main.c defines.h
19
main.o: main.c defines.h
19
	$(CC) $(CFLAGS) main.c
20
	$(CC) -c $(MY_CFLAGS) main.c
20
21
21
memory.o: memory.c defines.h
22
memory.o: memory.c defines.h
22
	$(CC) $(CFLAGS) memory.c
23
	$(CC) -c $(MY_CFLAGS) memory.c
23
24
24
png.o: png.c defines.h
25
png.o: png.c defines.h
25
	$(CC) $(CFLAGS) png.c
26
	$(CC) -c $(MY_CFLAGS) png.c
26
27
27
editor.o: editor.c defines.h
28
editor.o: editor.c defines.h
28
	$(CC) $(CFLAGS) editor.c
29
	$(CC) -c $(MY_CFLAGS) editor.c
29
30
30
common.o: common.c defines.h
31
common.o: common.c defines.h
31
	$(CC) $(CFLAGS) common.c
32
	$(CC) -c $(MY_CFLAGS) common.c
32
33
33
palette.o: palette.c defines.h
34
palette.o: palette.c defines.h
34
	$(CC) $(CFLAGS) palette.c
35
	$(CC) -c $(MY_CFLAGS) palette.c
35
36
36
tiled.o: tiled.c defines.h
37
tiled.o: tiled.c defines.h
37
	$(CC) $(CFLAGS) tiled.c
38
	$(CC) -c $(MY_CFLAGS) tiled.c
38
39
39
jpg.o: jpg.c defines.h
40
jpg.o: jpg.c defines.h
40
	$(CC) $(CFLAGS) jpg.c
41
	$(CC) -c $(MY_CFLAGS) jpg.c
41
42
42
bmp.o: bmp.c defines.h
43
bmp.o: bmp.c defines.h
43
	$(CC) $(CFLAGS) bmp.c
44
	$(CC) -c $(MY_CFLAGS) bmp.c
44
45
45
string.o: string.c defines.h
46
string.o: string.c defines.h
46
	$(CC) $(CFLAGS) string.c
47
	$(CC) -c $(MY_CFLAGS) string.c
47
48
48
pcx.o: pcx.c defines.h
49
pcx.o: pcx.c defines.h
49
	$(CC) $(CFLAGS) pcx.c
50
	$(CC) -c $(MY_CFLAGS) pcx.c
50
51
51
prefs.o: prefs.c defines.h
52
prefs.o: prefs.c defines.h
52
	$(CC) $(CFLAGS) prefs.c
53
	$(CC) -c $(MY_CFLAGS) prefs.c
53
54
54
exit.o: exit.c defines.h
55
exit.o: exit.c defines.h
55
	$(CC) $(CFLAGS) exit.c
56
	$(CC) -c $(MY_CFLAGS) exit.c
56
57
57
tga.o: tga.c defines.h
58
tga.o: tga.c defines.h
58
	$(CC) $(CFLAGS) tga.c
59
	$(CC) -c $(MY_CFLAGS) tga.c
59
60
60
61
61
$(OFILES): $(HFILES)
62
$(OFILES): $(HFILES)

Return to bug 367893