]>
Commit | Line | Data |
---|---|---|
50fd9d2c | 1 | --- edgar-0.31/makefile~ 2009-09-24 23:15:16.000000000 +0200 |
2 | +++ edgar-0.31/makefile 2009-09-25 14:59:18.000000000 +0200 | |
3 | @@ -20,9 +20,9 @@ | |
696cb600 | 4 | CXX = gcc |
5 | ||
6 | PREFIX = $(DESTDIR)/usr | |
7 | -BIN_DIR = $(PREFIX)/games/ | |
8 | +BIN_DIR = $(PREFIX)/bin/ | |
9 | DOC_DIR = $(PREFIX)/share/doc/$(PROG)/ | |
10 | -ICON_DIR = $(PREFIX)/share/icons/hicolor/ | |
11 | +ICON_DIR = $(PREFIX)/share/pixmaps/ | |
12 | DESKTOP_DIR = $(PREFIX)/share/applications/ | |
13 | LOCALE_DIR = $(PREFIX)/share/locale/ | |
14 | LOCALE_MO = $(patsubst %.po,%.mo,$(wildcard locale/*.po)) | |
50fd9d2c | 15 | @@ -30,14 +30,10 @@ |
696cb600 | 16 | ifeq ($(OS),Windows_NT) |
17 | DATA_DIR = | |
18 | else | |
19 | -DATA_DIR = $(PREFIX)/share/games/edgar/ | |
20 | +DATA_DIR = $(PREFIX)/share/edgar/ | |
21 | endif | |
22 | ||
23 | -ifeq ($(DEV),1) | |
24 | -CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" | |
25 | -else | |
073a0def | 26 | -CFLAGS = -Wall -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" |
696cb600 | 27 | -endif |
28 | +CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" | |
29 | ||
30 | ifeq ($(OS),Windows_NT) | |
31 | LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lz -llibintl -lm | |
50fd9d2c | 32 | @@ -77,7 +73,7 @@ |
33 | all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG) | |
696cb600 | 34 | |
35 | makefile.dep : src/*/*.c src/*.c | |
36 | - for i in src/*.c src/*/*.c; do gcc -MM "$${i}"; done > $@ | |
37 | + for i in src/*.c src/*/*.c; do $(CXX) -MM "$${i}"; done > $@ | |
38 | ||
39 | # compiling other source files. | |
40 | %.o: | |
50fd9d2c | 41 | @@ -88,19 +84,19 @@ |
696cb600 | 42 | |
43 | # linking the program. | |
44 | $(PROG): $(MAIN_OBJS) $(CORE_OBJS) | |
45 | - $(CXX) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS) | |
073a0def | 46 | - |
696cb600 | 47 | + $(CXX) $(LDFLAGS) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS) |
073a0def | 48 | + |
696cb600 | 49 | # linking the program. |
50 | $(ED_PROG): $(EDIT_OBJS) $(CORE_OBJS) | |
51 | - $(CXX) $(EDIT_OBJS) $(CORE_OBJS) -o $(ED_PROG) $(LFLAGS) | |
52 | + $(CXX) $(LDFLAGS) $(EDIT_OBJS) $(CORE_OBJS) -o $(ED_PROG) $(LFLAGS) | |
53 | ||
54 | # linking the program. | |
55 | $(PAK_PROG): $(PAK_OBJS) | |
56 | - $(CXX) $(PAK_OBJS) -o $(PAK_PROG) $(LFLAGS) | |
57 | + $(CXX) $(LDFLAGS) $(PAK_OBJS) -o $(PAK_PROG) $(LFLAGS) | |
50fd9d2c | 58 | |
59 | # linking the program. | |
60 | $(PO_PROG): $(PO_OBJS) | |
61 | - $(CXX) $(PO_OBJS) -o $(PO_PROG) $(LFLAGS) | |
62 | + $(CXX) $(LDFLAGS) $(PO_OBJS) -o $(PO_PROG) $(LFLAGS) | |
696cb600 | 63 | |
64 | # cleaning everything that can be automatically recreated with "make". | |
65 | clean: | |
50fd9d2c | 66 | @@ -122,9 +118,9 @@ |
696cb600 | 67 | mkdir -p $(ICON_DIR)64x64/apps |
68 | mkdir -p $(DESKTOP_DIR) | |
69 | ||
70 | - install -o root -g games -m 755 $(PROG) $(BIN_DIR)$(PROG) | |
71 | - install -o root -g games -m 644 $(PAK_FILE) $(DATA_DIR)$(PAK_FILE) | |
72 | - install -o root -g games -m 644 $(DOCS) $(DOC_DIR) | |
73 | + install $(PROG) $(BIN_DIR)$(PROG) | |
74 | + install $(PAK_FILE) $(DATA_DIR)$(PAK_FILE) | |
75 | + install $(DOCS) $(DOC_DIR) | |
76 | cp $(ICONS)$(PROG).png $(ICON_DIR)16x16/apps/ | |
77 | cp $(ICONS)$(PROG).png $(ICON_DIR)32x32/apps/ | |
78 | cp $(ICONS)$(PROG).png $(ICON_DIR)64x64/apps/ |