| 696cb600 |
1 | --- edgar-0.20/makefile~ 2009-07-22 10:56:21.000000000 +0200 |
| 2 | +++ edgar-0.20/makefile 2009-07-22 10:56:09.000000000 +0200 |
| 3 | @@ -18,9 +18,9 @@ |
| 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)) |
| 15 | @@ -28,14 +28,10 @@ |
| 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 |
| 26 | -CFLAGS = -Wall -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" |
| 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 |
| 32 | @@ -69,7 +65,7 @@ |
| 33 | all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) |
| 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: |
| 41 | @@ -80,15 +76,15 @@ |
| 42 | |
| 43 | # linking the program. |
| 44 | $(PROG): $(MAIN_OBJS) $(CORE_OBJS) |
| 45 | - $(CXX) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS) |
| 46 | + $(CXX) $(LDFLAGS) $(MAIN_OBJS) $(CORE_OBJS) -o $(PROG) $(LFLAGS) |
| 47 | |
| 48 | # linking the program. |
| 49 | $(ED_PROG): $(EDIT_OBJS) $(CORE_OBJS) |
| 50 | - $(CXX) $(EDIT_OBJS) $(CORE_OBJS) -o $(ED_PROG) $(LFLAGS) |
| 51 | + $(CXX) $(LDFLAGS) $(EDIT_OBJS) $(CORE_OBJS) -o $(ED_PROG) $(LFLAGS) |
| 52 | |
| 53 | # linking the program. |
| 54 | $(PAK_PROG): $(PAK_OBJS) |
| 55 | - $(CXX) $(PAK_OBJS) -o $(PAK_PROG) $(LFLAGS) |
| 56 | + $(CXX) $(LDFLAGS) $(PAK_OBJS) -o $(PAK_PROG) $(LFLAGS) |
| 57 | |
| 58 | # cleaning everything that can be automatically recreated with "make". |
| 59 | clean: |
| 60 | @@ -110,9 +106,9 @@ |
| 61 | mkdir -p $(ICON_DIR)64x64/apps |
| 62 | mkdir -p $(DESKTOP_DIR) |
| 63 | |
| 64 | - install -o root -g games -m 755 $(PROG) $(BIN_DIR)$(PROG) |
| 65 | - install -o root -g games -m 644 $(PAK_FILE) $(DATA_DIR)$(PAK_FILE) |
| 66 | - install -o root -g games -m 644 $(DOCS) $(DOC_DIR) |
| 67 | + install $(PROG) $(BIN_DIR)$(PROG) |
| 68 | + install $(PAK_FILE) $(DATA_DIR)$(PAK_FILE) |
| 69 | + install $(DOCS) $(DOC_DIR) |
| 70 | cp $(ICONS)$(PROG).png $(ICON_DIR)16x16/apps/ |
| 71 | cp $(ICONS)$(PROG).png $(ICON_DIR)32x32/apps/ |
| 72 | cp $(ICONS)$(PROG).png $(ICON_DIR)64x64/apps/ |
projects / packages / edgar.git / blame