Attachment #19695 for bug #31865

View | Details | Raw Unified | Return to bug 31865
Collapse All | Expand All




-- frontends/htmlfe.c

										<TD ALIGN=\"RIGHT\">\n\
											%llu\n\
										</TD>\n\
									</TR>\
", host->bytes_sent, host->bytes_received);

	fprintf(out, "\
-- frontends/traffic-togif

my $y_size = 750;

my $traffic_tops = "/usr/sbin/traffic-tops";
my $gs = "/usr/bin/gs";
my $pnmcrop = "/usr/bin/pnmcrop";
my $pnmscale = "/usr/bin/pnmscale";
my $ppmtogif = "/usr/bin/ppmtogif";
-- collector/Makefile

CFLAGS+= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
OBJS=packet-parse.o packet-summary.o summary-output.o ../util.o
TARGETS=traffic-collector
LFLAGS=-L..

all: $(TARGETS)

traffic-collector: traffic-collector.o $(OBJS)
	$(CC) $(CFLAGS) -o $@ traffic-collector.o $(OBJS) $(LIBS)

install:
	install -m 750 -o root -g root traffic-collector $(SBINDIR)
-- frontends/Makefile

CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
OBJS=htmlfe.o psfe.o textfe.o
TARGETS=traffic-tops traffic-totext traffic-tohtml
LFLAGS=-L..

all: $(OBJS) $(TARGETS)

traffic-tops: traffic-tops.o psfe.o ../libreport.a
	$(CC) $(CFLAGS) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm

traffic-totext: traffic-totext.o textfe.o ../libreport.a
	$(CC) $(CFLAGS) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS)

traffic-tohtml: traffic-tohtml.o htmlfe.o ../libreport.a
	$(CC) $(CFLAGS) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)

install:
	install -m 755 -o root -g root traffic-tops $(SBINDIR)
-- sort/Makefile

CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
OBJS=
TARGETS=traffic-sort
LFLAGS=-L..

all: $(TARGETS)

traffic-sort: traffic-sort.o ../libreport.a
	$(CC) $(CFLAGS) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)

install:
	install -m 755 -o root -g root traffic-sort $(SBINDIR)
-- utils/Makefile

CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
OBJS=
TARGETS=traffic-resolve traffic-exclude
LFLAGS=-L..

all: $(OBJS) $(TARGETS)

traffic-exclude: traffic-exclude.o ../libreport.a
	$(CC) $(CFLAGS) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS)

traffic-resolve: traffic-resolve.o ../libreport.a
	$(CC) $(CFLAGS) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)

install:
	install -m 755 -o root -g root traffic-resolve $(SBINDIR)

Return to bug 31865

Line Link Here

(-) (-19 / +13 lines)
	-- frontends/htmlfe.c
Lines 188-194 Link Here
188	<TD ALIGN=\"RIGHT\">\n\	188	<TD ALIGN=\"RIGHT\">\n\
189	%llu\n\	189	%llu\n\
190	</TD>\n\	190	</TD>\n\
191	</TR>	191	</TR>\
192	", host->bytes_sent, host->bytes_received);	192	", host->bytes_sent, host->bytes_received);
193		193
194	fprintf(out, "\	194	fprintf(out, "\
195	-- frontends/traffic-togif
Lines 31-37 Link Here
31	my $y_size = 750;	31	my $y_size = 750;
32		32
33	my $traffic_tops = "/usr/sbin/traffic-tops";	33	my $traffic_tops = "/usr/sbin/traffic-tops";
34	my $gs = "/usr/bin/ghostscript";	34	my $gs = "/usr/bin/gs";
35	my $pnmcrop = "/usr/bin/pnmcrop";	35	my $pnmcrop = "/usr/bin/pnmcrop";
36	my $pnmscale = "/usr/bin/pnmscale";	36	my $pnmscale = "/usr/bin/pnmscale";
37	my $ppmtogif = "/usr/bin/ppmtogif";	37	my $ppmtogif = "/usr/bin/ppmtogif";
38	-- collector/Makefile
Lines 1-4 Link Here
1	CFLAGS= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)	1	CFLAGS+= -DVERSION="\"$(VERSION)"\" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
2	OBJS=packet-parse.o packet-summary.o summary-output.o ../util.o	2	OBJS=packet-parse.o packet-summary.o summary-output.o ../util.o
3	TARGETS=traffic-collector	3	TARGETS=traffic-collector
4	LFLAGS=-L..	4	LFLAGS=-L..
Lines 7-13 Link Here
7	all: $(TARGETS)	7	all: $(TARGETS)
8		8
9	traffic-collector: traffic-collector.o $(OBJS)	9	traffic-collector: traffic-collector.o $(OBJS)
10	$(CC) -o $@ traffic-collector.o $(OBJS) $(LIBS)	10	$(CC) $(CFLAGS) -o $@ traffic-collector.o $(OBJS) $(LIBS)
11		11
12	install:	12	install:
13	install -m 750 -o root -g root traffic-collector $(SBINDIR)	13	install -m 750 -o root -g root traffic-collector $(SBINDIR)
14	-- frontends/Makefile
Lines 1-4 Link Here
1	CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)	1	CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
2	OBJS=htmlfe.o psfe.o textfe.o	2	OBJS=htmlfe.o psfe.o textfe.o
3	TARGETS=traffic-tops traffic-totext traffic-tohtml	3	TARGETS=traffic-tops traffic-totext traffic-tohtml
4	LFLAGS=-L..	4	LFLAGS=-L..
Lines 7-19 Link Here
7	all: $(OBJS) $(TARGETS)	7	all: $(OBJS) $(TARGETS)
8		8
9	traffic-tops: traffic-tops.o psfe.o ../libreport.a	9	traffic-tops: traffic-tops.o psfe.o ../libreport.a
10	$(CC) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm	10	$(CC) $(CFLAGS) -o $@ traffic-tops.o psfe.o $(LFLAGS) $(LIBS) -lm
11		11
12	traffic-totext: traffic-totext.o textfe.o ../libreport.a	12	traffic-totext: traffic-totext.o textfe.o ../libreport.a
13	$(CC) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS)	13	$(CC) $(CFLAGS) -o $@ traffic-totext.o textfe.o $(LFLAGS) $(LIBS)
14		14
15	traffic-tohtml: traffic-tohtml.o htmlfe.o ../libreport.a	15	traffic-tohtml: traffic-tohtml.o htmlfe.o ../libreport.a
16	$(CC) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)	16	$(CC) $(CFLAGS) -o $@ traffic-tohtml.o htmlfe.o $(LFLAGS) $(LIBS)
17		17
18	install:	18	install:
19	install -m 755 -o root -g root traffic-tops $(SBINDIR)	19	install -m 755 -o root -g root traffic-tops $(SBINDIR)
20	-- sort/Makefile
Lines 1-4 Link Here
1	CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)	1	CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
2	OBJS=	2	OBJS=
3	TARGETS=traffic-sort	3	TARGETS=traffic-sort
4	LFLAGS=-L..	4	LFLAGS=-L..
Lines 7-13 Link Here
7	all: $(TARGETS)	7	all: $(TARGETS)
8		8
9	traffic-sort: traffic-sort.o ../libreport.a	9	traffic-sort: traffic-sort.o ../libreport.a
10	$(CC) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)	10	$(CC) $(CFLAGS) $(LFLAGS) -o $@ traffic-sort.o $(LIBS)
11		11
12	install:	12	install:
13	install -m 755 -o root -g root traffic-sort $(SBINDIR)	13	install -m 755 -o root -g root traffic-sort $(SBINDIR)
14	-- utils/Makefile
Lines 1-4 Link Here
1	CFLAGS= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)	1	CFLAGS+= -DVERSION="\"$(VERSION)\"" $(DEFINES) $(WARNFLAGS) $(DEBUGFLAGS) $(INCLUDES) -I.. $(OPT_FLAGS)
2	OBJS=	2	OBJS=
3	TARGETS=traffic-resolve traffic-exclude	3	TARGETS=traffic-resolve traffic-exclude
4	LFLAGS=-L..	4	LFLAGS=-L..
Lines 7-16 Link Here
7	all: $(OBJS) $(TARGETS)	7	all: $(OBJS) $(TARGETS)
8		8
9	traffic-exclude: traffic-exclude.o ../libreport.a	9	traffic-exclude: traffic-exclude.o ../libreport.a
10	$(CC) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS)	10	$(CC) $(CFLAGS) -o $@ traffic-exclude.o $(LFLAGS) $(LIBS)
11		11
12	traffic-resolve: traffic-resolve.o ../libreport.a	12	traffic-resolve: traffic-resolve.o ../libreport.a
13	$(CC) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)	13	$(CC) $(CFLAGS) -o $@ traffic-resolve.o $(LFLAGS) $(LIBS)
14		14
15	install:	15	install:
16	install -m 755 -o root -g root traffic-resolve $(SBINDIR)	16	install -m 755 -o root -g root traffic-resolve $(SBINDIR)