packages: edgar/edgar-makefile.patch - updated for 0.85

[madget]

Author: madget                       Date: Fri May 20 19:35:15 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.85

---- Files affected:
packages/edgar:
   edgar-makefile.patch (1.8 -> 1.9) 

---- Diffs:

================================================================
Index: packages/edgar/edgar-makefile.patch
diff -u packages/edgar/edgar-makefile.patch:1.8 packages/edgar/edgar-makefile.patch:1.9
--- packages/edgar/edgar-makefile.patch:1.8	Tue Oct  5 11:04:57 2010
+++ packages/edgar/edgar-makefile.patch	Fri May 20 21:35:10 2011
@@ -1,5 +1,5 @@
---- edgar-0.72/makefile~	2010-10-02 20:11:24.000000000 +0200
-+++ edgar-0.72/makefile	2010-10-05 10:56:40.559985331 +0200
+--- edgar-0.85/makefile.orig	2011-05-16 22:00:04.000000000 +0200
++++ edgar-0.85/makefile	2011-05-20 21:09:49.046666675 +0200
 @@ -24,7 +24,7 @@
  CXX       = gcc
  
@@ -17,23 +17,23 @@
 -CFLAGS = -Wall -g -pedantic -Werror -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
 -#CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
 -else
--CFLAGS = -Wall -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
+-CFLAGS = -Wall -O2 -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
 -#CFLAGS = -Wall -Os -pedantic -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
 -endif
 +CFLAGS = $(OPTFLAGS) -DVERSION=$(VERSION) -DRELEASE=$(RELEASE) -DDEV=$(DEV) -DINSTALL_PATH=\"$(DATA_DIR)\" -DLOCALE_DIR=\"$(LOCALE_DIR)\" -DPAK_FILE=\"$(PAK_FILE)\" -DMEDAL_SERVER_HOST=\"$(MEDAL_SERVER_HOST)\" -DMEDAL_SERVER_PORT=$(MEDAL_SERVER_PORT)
  
  ifeq ($(OS),Windows_NT)
  LFLAGS = `sdl-config --libs` -lSDL -lSDL_image -lSDL_mixer -lSDL_ttf -lSDL_net -lz -llibintl -lm
-@@ -97,7 +91,7 @@
+@@ -102,7 +96,7 @@
  all : $(PROG) makefile.dep $(ED_PROG) $(PAK_PROG) $(LOCALE_MO) $(PO_PROG)
  
- makefile.dep : src/*/*.c src/*.c
+ makefile.dep : src/*/*.h src/*.h
 -	for i in src/*.c src/*/*.c; do gcc -MM "$${i}"; done > $@
 +	for i in src/*.c src/*/*.c; do $(CXX) -MM "$${i}"; done > $@
  
  # compiling other source files.
  %.o:
-@@ -108,23 +102,23 @@
+@@ -113,23 +107,23 @@
  
  # linking the program.
  $(PROG): $(MAIN_OBJS) $(CORE_OBJS)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/edgar/edgar-makefile.patch?r1=1.8&r2=1.9&f=u