1 --- edgar-0.25/makefile~ 2009-08-11 19:07:40.000000000 +0200
2 +++ edgar-0.25/makefile 2009-08-21 11:52:55.000000000 +0200
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))
16 ifeq ($(OS),Windows_NT)
19 -DATA_DIR = $(PREFIX)/share/games/edgar/
20 +DATA_DIR = $(PREFIX)/share/edgar/
24 -CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\"
26 -CFLAGS = -Wall -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\"
28 +CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\"
30 ifeq ($(OS),Windows_NT)
31 LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lz -llibintl -lm
33 all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO)
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 > $@
39 # compiling other source files.
43 # linking the program.
44 $(PROG): $(MAIN_OBJS) $(CORE_OBJS)
45 - $(CXX) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS)
47 + $(CXX) $(LDFLAGS) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS)
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)
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)
59 # cleaning everything that can be automatically recreated with "make".
62 mkdir -p $(ICON_DIR)64x64/apps
63 mkdir -p $(DESKTOP_DIR)
65 - install -o root -g games -m 755 $(PROG) $(BIN_DIR)$(PROG)
66 - install -o root -g games -m 644 $(PAK_FILE) $(DATA_DIR)$(PAK_FILE)
67 - install -o root -g games -m 644 $(DOCS) $(DOC_DIR)
68 + install $(PROG) $(BIN_DIR)$(PROG)
69 + install $(PAK_FILE) $(DATA_DIR)$(PAK_FILE)
70 + install $(DOCS) $(DOC_DIR)
71 cp $(ICONS)$(PROG).png $(ICON_DIR)16x16/apps/
72 cp $(ICONS)$(PROG).png $(ICON_DIR)32x32/apps/
73 cp $(ICONS)$(PROG).png $(ICON_DIR)64x64/apps/