samboy/MaraDNS
1
3
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Makefile doover: No more - in targets

Browse source 
We will need to have `/` in targets, but, with some work, I got
all of the `-` out of targets.

Next: Things do not compile with `c99`
This commit is contained in:
Sam Trenholme 2022-10-30 17:28:47 -07:00
parent 17a5405702
commit 7196be5c2a
12 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/Makefile.linux
View file

@ -58,7 +58,7 @@ clean:
cd ../qual ; make clean ; \
cd ../server ; make clean ; \
cp Makefile.authonly Makefile ; \
cd ../test ; make clean ; \
cd ../sqa ; make clean ; \
cd ../tools ; make clean ; \
cd misc ; make clean ; \
cd ../../utf8 ; make clean ; \

20
rng/Makefile
View file

@ -3,7 +3,10 @@
ROBJECTS=rngalgfst.o rngapifst.o
OBJECTS=$(ROBJECTS)
TABLES=rng-32bit-tables.h
TABLES=rng32bittables.h
# If cross-compiling, change the next line
HOSTCC=$(CC)
#FLAGS = -g -Wall
#FLAGS = -g
@ -18,15 +21,16 @@ clean:
superclean:
rm -f $(ROBJECTS) core make_32bit_tables $(TABLES)
rngalgfst.o: rng-alg-fst.c rng-alg-fst.h $(TABLES)
$(CC) -c $(FLAGS) -o rngalgfst.o rng-alg-fst.c
rngalgfst.o: rngalgfst.c rngalgfst.h $(TABLES)
$(CC) -c $(FLAGS) -o rngalgfst.o rngalgfst.c
rngapifst.o: rng-alg-fst.o rng-api-fst.h
$(CC) -c $(FLAGS) -o rngapifst.o rng-api-fst.c
rngapifst.o: rngalgfst.o rngapifst.h
$(CC) -c $(FLAGS) -o rngapifst.o rngapifst.c
make_32bit_tables: make_32bit_tables.c
$(CC) -o make_32bit_tables make_32bit_tables.c
$(HOSTCC) -o make_32bit_tables make_32bit_tables.c
rng-32bit-tables.h: make_32bit_tables
./make_32bit_tables > rng-32bit-tables.h
rng32bittables.h: make_32bit_tables
./make_32bit_tables > rng-32bit-tables.h ; \
./make_32bit_tables > rng32bittables.h

4
rng/rng-alg-fst.c → rng/rngalgfst.c
View file

@ -47,8 +47,8 @@
#include <stdlib.h>
#include <stdio.h>
#include "rng-alg-fst.h"
#include "rng-32bit-tables.h"
#include "rngalgfst.h"
#include "rng32bittables.h"
static const u32 rcon[] = {
0x01000000, 0x02000000, 0x04000000, 0x08000000,

0
rng/rng-alg-fst.h → rng/rngalgfst.h
View file

0
rng/rng-api-fst.c → rng/rngapifst.c
View file

2
rng/rng-api-fst.h → rng/rngapifst.h
View file

@ -59,7 +59,7 @@
#define __RIJNDAEL_API_FST_H
#include <stdio.h>
#include "rng-alg-fst.h"
#include "rngalgfst.h"
/* Generic Defines */
#define DIR_ENCRYPT 0 /* Are we encrpyting? */

2
tcp/zoneserver.c
View file

@ -54,7 +54,7 @@
#include <arpa/inet.h>
#include <signal.h>
/* BEGIN RNG USING CODE */
#include "../rng/rng-api-fst.h"
#include "../rng/rngapifst.h"
/* END RNG USING CODE */
/* Function prototypes */
#include "../dns/functions_dns.h"

9
tools/Makefile.authonly
View file

@ -7,7 +7,7 @@ OBJECTS=$(JOBJS) $(MHOBJS) $(DOBJECTS) $(SOBJECTS)
ROBJECTS=../rng/rngalgfst.o ../rng/rngapifst.o
POBJECTS=../parse/ParseCsv1.o ../parse/ParseMaraRc.o
Q=$(ROBJECTS) $(POBJECTS)
EXECS=askmara askmara-tcp strip.control benchmark duende
EXECS=askmara askmaratcp strip.control benchmark duende
#FLAGS = -g $(DEBUG)
#FLAGS = -g $(DEBUG)
@ -20,8 +20,11 @@ clean:
askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
$(CC) $(FLAGS) -DIPV6 -DAUTHONLY -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
askmaratcp: askmaratcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o askmaratcp askmaratcp.c \
$(OBJECTS) $(ROBJECTS) $(POBJECTS) ; \
$(CC) $(FLAGS) -o askmara-tcp askmaratcp.c \
$(OBJECTS) $(ROBJECTS) $(POBJECTS)
benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)

9
tools/Makefile.ipv6
View file

@ -7,7 +7,7 @@ OBJECTS=$(JOBJS) $(MHOBJS) $(DOBJECTS) $(SOBJECTS)
ROBJECTS=../rng/rngalgfst.o ../rng/rngapifst.o
POBJECTS=../parse/ParseCsv1.o ../parse/ParseMaraRc.o
Q=$(ROBJECTS) $(POBJECTS)
EXECS=askmara askmara-tcp strip.control benchmark duende
EXECS=askmara askmaratcp strip.control benchmark duende
#FLAGS = -g $(DEBUG)
#FLAGS = -g $(DEBUG)
@ -20,8 +20,11 @@ clean:
askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
$(CC) $(FLAGS) -DAUTHONLY -DIPV6 -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ)
askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
askmaratcp: askmaratcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o askmaratcp askmara-tcp.c \
$(OBJECTS) $(ROBJECTS) $(POBJECTS) ; \
$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c \
$(OBJECTS) $(ROBJECTS) $(POBJECTS)
benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)

7
tools/Makefile.mingw32
View file

@ -20,8 +20,11 @@ clean:
askmara: askmara.c askmara_labels_en.h $(OBJECTS) $(Q) $(OUTOBJ)
$(CC) $(FLAGS) -o askmara askmara.c $(OBJECTS) $(Q) $(OUTOBJ) -lwsock32
askmara-tcp: askmara-tcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o askmara-tcp askmara-tcp.c $(OBJECTS) $(ROBJECTS) $(POBJECTS)
askmaratcp: askmaratcp.c askmara_labels_en.h $(OBJECTS) $(ROBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o askmaratcp askmaratcp.c \
$(OBJECTS) $(ROBJECTS) $(POBJECTS) ; \
$(CC) $(FLAGS) -o askmara-tcp askmaratcp.c \
$(OBJECTS) $(ROBJECTS) $(POBJECTS)
benchmark: benchmark.c askmara_labels_en.h $(OBJECTS) $(POBJECTS)
$(CC) $(FLAGS) -o benchmark benchmark.c $(OBJECTS) $(POBJECTS)

2
tools/askmara.c
View file

@ -42,7 +42,7 @@
#include "askmara_labels_en.h"
/* BEGIN RNG USING CODE */
/* Yes, we use the RNG to make the psudo-random number */
#include "../rng/rng-api-fst.h"
#include "../rng/rngapifst.h"
/* END RNG USING CODE */
#include "../libs/MaraHash.h"

2
tools/askmara-tcp.c → tools/askmaratcp.c
View file

@ -42,7 +42,7 @@
#include "askmara_labels_en.h"
/* BEGIN RNG USING CODE */
/* Yes, we use the RNG to make the psudo-random number */
#include "../rng/rng-api-fst.h"
#include "../rng/rngapifst.h"
/* END RNG USING CODE */
#include "../libs/MaraHash.h"