summaryrefslogtreecommitdiff
path: root/package/maradns/patches/patch-server_Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'package/maradns/patches/patch-server_Makefile')
-rw-r--r--package/maradns/patches/patch-server_Makefile40
1 files changed, 32 insertions, 8 deletions
diff --git a/package/maradns/patches/patch-server_Makefile b/package/maradns/patches/patch-server_Makefile
index 96595433b..571fba3eb 100644
--- a/package/maradns/patches/patch-server_Makefile
+++ b/package/maradns/patches/patch-server_Makefile
@@ -1,5 +1,5 @@
---- maradns-1.4.03.orig/server/Makefile 2006-01-02 17:59:33.000000000 +0100
-+++ maradns-1.4.03/server/Makefile 2010-02-06 00:19:48.471836901 +0100
+--- maradns-1.4.05.orig/server/Makefile 2006-01-02 17:59:33.000000000 +0100
++++ maradns-1.4.05/server/Makefile 2011-01-21 16:45:45.307408698 +0100
@@ -1,11 +1,13 @@
-SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o
+SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o \
@@ -16,13 +16,37 @@
POBJECTS=../parse/ParseMaraRc.o ../parse/ParseCsv1.o $(POBJ4) $(POBJ5)
DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
ROBJECTS=../rng/rng-api-fst.o ../rng/rng-alg-fst.o
-@@ -46,6 +48,9 @@ timestamp.o: timestamp.c MaraDNS_locale.
- MaraAnyChain.o: MaraAnyChain.c
- $(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
+@@ -32,23 +34,26 @@ libs/tests:
+ cd libs ; make
-+udpsuccess.o: udpsuccess.c
-+ $(CC) -c $(FLAGS) -o udpsuccess.o udpsuccess.c
+ read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+- $(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o read_kvars.o read_kvars.c
+
+ MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
+- $(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c
++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.c
+
+ recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
+- $(CC) -c $(FLAGS) -o recursive.o recursive.c
++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o recursive.o recursive.c
+
+ timestamp.o: timestamp.c MaraDNS_locale.h
+- $(CC) -c $(FLAGS) -o timestamp.o timestamp.c
++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o timestamp.o timestamp.c
+
+ MaraAnyChain.o: MaraAnyChain.c
+- $(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c
+
++udpsuccess.o: udpsuccess.c
++ $(CC) -c $(CPPFLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.c
+
maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
++ $(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
+
+ simple: simple.c $(XOBJECTS) MaraDNS_locale.h
+- $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c
++ $(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c