restructured sources for a static library lib_pcap_generator

wkoroy · May 11, 2018 · 6d8daf9 · 6d8daf9
1 parent bf616e8
commit 6d8daf9
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 430 deletions.
diff --git a/Makefile b/Makefile
@@ -1,26 +1,16 @@
 APP = ./tcpmerge
 CC=gcc -g -O0
-CFLAGS=  -static -ldl -lrt -lpthread -Wall -Wextra
+CFLAGS=  -static -ldl -lrt -lpthread -Wall -Wextra -L./  -lpcap_file_generator
 
 all: $(APP)
-
 
-
-$(APPTEST): tcpmerge.o  pcap_file_generator.o pcap_file_reader.o utils.o
-	$(CC) tcpmerge.o pcap_file_generator.o pcap_file_reader.o utils.o -o $(APP) $(CFLAGS) -D TCPMERGE_TEST
-$(APP): tcpmerge.o  pcap_file_generator.o pcap_file_reader.o utils.o
-	$(CC) tcpmerge.o pcap_file_generator.o pcap_file_reader.o utils.o -o $(APP) $(CFLAGS)
+$(APPTEST): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS) -D TCPMERGE_TEST
+$(APP): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS)
 tcpmerge.o: tcpmerge.c	
 	$(CC) tcpmerge.c -c -Wall
 
-pcap_file_generator.o: pcap_file_generator.c	
-	$(CC) pcap_file_generator.c -c -Wall
-
-pcap_file_reader.o: pcap_file_reader.c
-	$(CC) pcap_file_reader.c -c -Wall
-
-utils.o: utils.c
-	$(CC) utils.c -c -Wall
 clean:
 	rm -f *.o ; rm $(APP);rm -f *~;
 test: $(APPTEST)
diff --git a/Makefile.release b/Makefile.release
@@ -1,21 +1,16 @@
 APP = ./tcpmerge
 CC=gcc
-CFLAGS= -static -ldl -lrt -lpthread -Wall -Wextra
+CFLAGS=  -static -ldl -lrt -lpthread -Wall -Wextra -L./  -lpcap_file_generator
 
 all: $(APP)
 
-$(APP): tcpmerge.o  pcap_file_generator.o pcap_file_reader.o utils.o
-	$(CC) tcpmerge.o pcap_file_generator.o pcap_file_reader.o utils.o -o $(APP) $(CFLAGS)
+$(APPTEST): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS) -D TCPMERGE_TEST
+$(APP): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS)
 tcpmerge.o: tcpmerge.c	
 	$(CC) tcpmerge.c -c -Wall
 
-pcap_file_generator.o: pcap_file_generator.c	
-	$(CC) pcap_file_generator.c -c -Wall
-
-pcap_file_reader.o: pcap_file_reader.c
-	$(CC) pcap_file_reader.c -c -Wall
-
-utils.o: utils.c
-	$(CC) utils.c -c -Wall
 clean:
-	rm -f *.o ; rm $(APP)
+	rm -f *.o ; rm $(APP);rm -f *~;
+test: $(APPTEST)
diff --git a/Makefile.test b/Makefile.test
@@ -1,21 +1,13 @@
 APP = ./tcpmerge
 CC=gcc -g -O0  -DTCPMERGE_TEST=1
-CFLAGS=-ldl -lrt -lpthread -Wall -Wextra
+CFLAGS=  -static -ldl -lrt -lpthread -Wall -Wextra -L./  -lpcap_file_generator
 
 all: $(APP)
 
-$(APP): tcpmerge.o  pcap_file_generator.o pcap_file_reader.o utils.o
-	$(CC) tcpmerge.o pcap_file_generator.o pcap_file_reader.o utils.o -o $(APP) $(CFLAGS)
+$(APP): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS)
 tcpmerge.o: tcpmerge.c	
 	$(CC) tcpmerge.c -c -Wall
 
-pcap_file_generator.o: pcap_file_generator.c	
-	$(CC) pcap_file_generator.c -c -Wall
-
-pcap_file_reader.o: pcap_file_reader.c
-	$(CC) pcap_file_reader.c -c -Wall
-
-utils.o: utils.c
-	$(CC) utils.c -c -Wall
 clean:
 	rm -f *.o ; rm $(APP)
diff --git a/Makefile32.release b/Makefile32.release
@@ -1,21 +1,16 @@
 APP = ./tcpmerge
-CC=gcc  -m32
-CFLAGS= -static -ldl -lrt -lpthread -Wall -Wextra
+CC=gcc -m32
+CFLAGS=  -static -ldl -lrt -lpthread -Wall -Wextra -L./  -lpcap_file_generator
 
 all: $(APP)
 
-$(APP): tcpmerge.o  pcap_file_generator.o pcap_file_reader.o utils.o
-	$(CC) tcpmerge.o pcap_file_generator.o pcap_file_reader.o utils.o -o $(APP) $(CFLAGS)
+$(APPTEST): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS) -D TCPMERGE_TEST
+$(APP): tcpmerge.o
+	$(CC) tcpmerge.o -o $(APP) $(CFLAGS)
 tcpmerge.o: tcpmerge.c	
 	$(CC) tcpmerge.c -c -Wall
 
-pcap_file_generator.o: pcap_file_generator.c	
-	$(CC) pcap_file_generator.c -c -Wall
-
-pcap_file_reader.o: pcap_file_reader.c
-	$(CC) pcap_file_reader.c -c -Wall
-
-utils.o: utils.c
-	$(CC) utils.c -c -Wall
 clean:
-	rm -f *.o ; rm $(APP)
+	rm -f *.o ; rm $(APP);rm -f *~;
+test: $(APPTEST)
diff --git a/ethernet.h b/ethernet.h
diff --git a/libpcap_file_generator.a b/libpcap_file_generator.a
diff --git a/pcap_file_generator.c b/pcap_file_generator.c
diff --git a/pcap_file_generator.h b/pcap_file_generator.h