Commit 80994f2e authored by Bruno Randolf's avatar Bruno Randolf

fix include dependencies and small stuff

parent 089d0548
......@@ -19,11 +19,11 @@
NAME=horst
DEBUG=0
PCAP=0
OBJS=main.o capture.o protocol_parser.o network.o wext.o \
util.o ieee80211_util.o listsort.o \
OBJS=main.o capture.o protocol_parser.o network.o wext.o util.o \
ieee80211_util.o listsort.o average.o \
display.o display-main.o display-filter.o display-help.o \
display-statistics.o display-essid.o display-history.o \
display-spectrum.o display-channel.o average.o
display-spectrum.o display-channel.o
LIBS=-lncurses -lm
CFLAGS+=-Wall -DDO_DEBUG=$(DEBUG) -g
......@@ -38,13 +38,28 @@ buildstamp=.build_debug$(DEBUG)pcap$(PCAP)
all: $(buildstamp) $(NAME)
# include dependencies
protocol_parser.o: protocol_parser.h ieee80211.h ieee80211_radiotap.h ieee80211_util.h \
prism_header.h olsr_header.h batman_header.h util.h main.h
main.o: main.h ieee80211.h protocol_parser.h display.h network.h util.h capture.h
display.o: display.h main.h util.h ieee80211.h olsr_header.h
network.o: network.h main.h util.h
util.o: util.h ieee80211.h
average.o: average.h util.h
capture.o: capture.h util.h
display.o: display.h main.h ieee80211.h
display-channel.o: display.h main.h
display-essid.o: display.h main.h util.h
display-filter.o: display.h main.h util.h ieee80211.h
display-help.o: display.h main.h util.h
display-history.o: display.h main.h util.h
display-main.o: display.h main.h util.h ieee80211.h olsr_header.h listsort.h
display-spectrum.o: display.h main.h util.h
display-statistics.o: display.h main.h util.h
ieee80211_util.o: ieee80211.h ieee80211_radiotap.h ieee80211_util.h main.h \
util.h
listsort.o: list.h listsort.h
main.o: protocol_parser.h display.h network.h main.h capture.h util.h \
ieee80211.h ieee80211_util.h wext.h average.h
network.o: main.h util.h network.h
protocol_parser.o: prism_header.h ieee80211_radiotap.h ieee80211.h \
ieee80211_util.h olsr_header.h batman_header.h protocol_parser.h \
main.h util.h
util.o: util.h ieee80211.h
wext.o: wext.h util.h
$(NAME): $(OBJS)
$(CC) $(LDFLAGS) -o $@ $(OBJS) $(LIBS)
......
......@@ -5,9 +5,9 @@
* Version 2. See the file COPYING for more details.
*/
#include <error.h>
#include "average.h"
#include "util.h"
#include <error.h>
/**
* DOC: Exponentially Weighted Moving Average (EWMA)
......
......@@ -23,7 +23,6 @@
#include "main.h"
#include "util.h"
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
u8*
ieee80211_get_bssid(struct ieee80211_hdr *hdr, size_t len)
......
......@@ -30,7 +30,6 @@
#include "ieee80211_util.h"
#include "olsr_header.h"
#include "batman_header.h"
#include "protocol_parser.h"
#include "main.h"
#include "util.h"
......
......@@ -87,6 +87,8 @@ kilo_mega_ize(unsigned int val);
#define max(_x, _y) ((_x) > (_y) ? (_x) : (_y))
#define min(_x, _y) ((_x) < (_y) ? (_x) : (_y))
#define DIV_ROUND_UP(n,d) (((n) + (d) - 1) / (d))
static inline __attribute__((const))
int is_power_of_2(unsigned long n)
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment