patch-server_Makefile 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152
  1. --- maradns-1.4.05.orig/server/Makefile 2006-01-02 17:59:33.000000000 +0100
  2. +++ maradns-1.4.05/server/Makefile 2011-01-21 16:45:45.307408698 +0100
  3. @@ -1,11 +1,13 @@
  4. -SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o
  5. +SOBJECTS=MaraBigHash.o recursive.o timestamp.o read_kvars.o MaraAnyChain.o \
  6. + udpsuccess.o
  7. JOBJS=../libs/JsStr.o ../libs/JsStrOS.o ../libs/JsStrCP.o
  8. MHOBJS=../libs/MaraHash.o
  9. MJOBJS=../qual/qual_timestamp.o
  10. +POBJ6=../parse/Csv2_rr_wks.o
  11. POBJ5=../parse/Csv2_database.o ../parse/Csv2_rr_txt.o ../parse/Csv2_esc_txt.o
  12. POBJ3=../parse/Csv2_rr_soa.o ../parse/Csv2_rr_aaaa.o ../parse/Csv2_rr_a.o
  13. POBJ2=../parse/Csv2_read.o ../parse/Csv2_main.o ../parse/Csv2_parse.o $(POBJ3)
  14. -POBJ4=../parse/ParseIpAcl.o ../parse/Parse_ipv6.o $(POBJ2)
  15. +POBJ4=../parse/ParseIpAcl.o ../parse/Parse_ipv6.o $(POBJ2) $(POBJ6)
  16. POBJECTS=../parse/ParseMaraRc.o ../parse/ParseCsv1.o $(POBJ4) $(POBJ5)
  17. DOBJECTS=../dns/Queries.o ../dns/Compress.o ../dns/bobbit.o ../dns/Decompress.o
  18. ROBJECTS=../rng/rng-api-fst.o ../rng/rng-alg-fst.o
  19. @@ -32,23 +34,26 @@ libs/tests:
  20. cd libs ; make
  21. read_kvars.o: read_kvars.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
  22. - $(CC) -c $(FLAGS) -o read_kvars.o read_kvars.c
  23. + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o read_kvars.o read_kvars.c
  24. MaraBigHash.o: MaraBigHash.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h MaraBigHash_locale.h
  25. - $(CC) -c $(FLAGS) -o MaraBigHash.o MaraBigHash.c
  26. + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraBigHash.o MaraBigHash.c
  27. recursive.o: recursive.c ../libs/JsStr.h ../libs/MaraHash.h ../MaraDns.h
  28. - $(CC) -c $(FLAGS) -o recursive.o recursive.c
  29. + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o recursive.o recursive.c
  30. timestamp.o: timestamp.c MaraDNS_locale.h
  31. - $(CC) -c $(FLAGS) -o timestamp.o timestamp.c
  32. + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o timestamp.o timestamp.c
  33. MaraAnyChain.o: MaraAnyChain.c
  34. - $(CC) -c $(FLAGS) -o MaraAnyChain.o MaraAnyChain.c
  35. + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o MaraAnyChain.o MaraAnyChain.c
  36. +
  37. +udpsuccess.o: udpsuccess.c
  38. + $(CC) -c $(CPPFLAGS) $(CFLAGS) -o udpsuccess.o udpsuccess.c
  39. maradns: MaraDNS.c $(OBJECTS) MaraDNS_locale.h
  40. - $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
  41. + $(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o maradns MaraDNS.c $(OBJECTS) -lpthread
  42. simple: simple.c $(XOBJECTS) MaraDNS_locale.h
  43. - $(CC) $(FLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c
  44. + $(CC) $(CFLAGS) $(LDFLAGS) -DVERSION=\"$(VERSION)\" -DCOMPILED=\"$(COMPILED)\" -o simple $(OBJECTS) simple.c