Attachment #161919 for bug #233317




++ chat/Makefile.linux

CDEF4=	-DFNDELAY=O_NDELAY		# Old name value
CDEFS=	$(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)

COPTS=	-O2 -g -pipe
CFLAGS=	$(COPTS) $(CDEFS)

INSTALL= install

all:	chat

chat:	chat.o
	$(CC) $(LDFLAGS) -o $@ $^

chat.o:	chat.c
	$(CC) -c $(CFLAGS) -o chat.o chat.c
++ pppd/Makefile.linux


# CC = gcc
#
COPTS+= -Wall
LIBS =

# Uncomment the next 2 lines to include support for Microsoft's

	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)

pppd: $(PPPDOBJS)
	$(CC) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)

srp-entry:	srp-entry.c
	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
++ pppd/plugins/Makefile.linux

# CC	= gcc
COPTS	= -O2 -g
CFLAGS	= $(COPTS) -I.. -I../../include -fPIC
LIBS = 
INSTALL	= install

DESTDIR = $(INSTROOT)@DESTDIR@

	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done

%.so: %.c
	$(CC) -shared $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)

VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)

++ pppd/plugins/pppoatm/Makefile.linux

# CC	= gcc
COPTS	= -O2 -g
CFLAGS	= $(COPTS) -I../.. -I../../../include -fPIC
LDFLAGS	= -shared
INSTALL	= install

#***********************************************************************

all: $(PLUGIN)

$(PLUGIN): $(PLUGIN_OBJS)
	$(CC) -shared $(LDFLAGS) -o $@ $^ $(LIBS)

install: all
	$(INSTALL) -d -m 755 $(LIBDIR)
++ pppd/plugins/radius/Makefile.linux

INSTALL	= install

PLUGIN=radius.so radattr.so radrealms.so
CFLAGS=$(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON

# Uncomment the next line to include support for Microsoft's
# MS-CHAP authentication protocol.

	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)

radius.so: radius.o libradiusclient.a
	$(CC) -shared $(LDFLAGS) -o $@ $^

radattr.so: radattr.o
	$(CC) -shared $(LDFLAGS) -o $@ $^

radrealms.so: radrealms.o
	$(CC) -shared $(LDFLAGS) -o $@ $^

CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
	clientid.o sendserver.o lock.o util.o md5.o
++ pppd/plugins/rp-pppoe/Makefile.linux

# Version is set ONLY IN THE MAKEFILE!  Don't delete this!
VERSION=3.3

COPTS=-O2 -g
CFLAGS=$(COPTS) -I../../../include/linux
all: rp-pppoe.so pppoe-discovery

pppoe-discovery: libplugin.a pppoe-discovery.o
	$(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o libplugin.a

pppoe-discovery.o: pppoe-discovery.c
	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c

rp-pppoe.so: libplugin.a plugin.o
	$(CC) -shared $(LDFLAGS) -o rp-pppoe.so plugin.o libplugin.a

install: all
	$(INSTALL) -d -m 755 $(LIBDIR)
++ pppdump/Makefile.linux

BINDIR = $(DESTDIR)/sbin
MANDIR = $(DESTDIR)/share/man/man8

CFLAGS=$(COPTS) -I../include/net
OBJS = pppdump.o bsd-comp.o deflate.o zlib.o

INSTALL= install

all:	pppdump

pppdump: $(OBJS)
	$(CC) $(LDFLAGS) -o pppdump $(OBJS)

clean:
	rm -f pppdump $(OBJS) *~
++ pppstats/Makefile.linux

PPPSTATOBJS = pppstats.o

#CC = gcc
COPTS = -O
COMPILE_FLAGS = -I../include
LIBS =


	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)

pppstats: $(PPPSTATSRCS)
	$(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)

clean:
	rm -f pppstats *~ #* core

Return to bug 233317

Line Link Here

(-)file_not_specified_in_diff (-31 / +25 lines)
0	-- chat/Makefile.linux	0	++ chat/Makefile.linux
Lines 10-16 Link Here
10	CDEF4= -DFNDELAY=O_NDELAY # Old name value	10	CDEF4= -DFNDELAY=O_NDELAY # Old name value
11	CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)	11	CDEFS= $(CDEF1) $(CDEF2) $(CDEF3) $(CDEF4)
12		12
13	COPTS= -O2 -g -pipe
14	CFLAGS= $(COPTS) $(CDEFS)	13	CFLAGS= $(COPTS) $(CDEFS)
15		14
16	INSTALL= install	15	INSTALL= install
Lines 18-24 Link Here
18	all: chat	17	all: chat
19		18
20	chat: chat.o	19	chat: chat.o
21	$(CC) -o chat chat.o	20	$(CC) $(LDFLAGS) -o $@ $^
22		21
23	chat.o: chat.c	22	chat.o: chat.c
24	$(CC) -c $(CFLAGS) -o chat.o chat.c	23	$(CC) -c $(CFLAGS) -o chat.o chat.c
25	-- pppd/Makefile.linux	24	++ pppd/Makefile.linux
Lines 32-38 Link Here
32		32
33	# CC = gcc	33	# CC = gcc
34	#	34	#
35	COPTS = -O2 -pipe -Wall -g	35	COPTS+= -Wall
36	LIBS =	36	LIBS =
37		37
38	# Uncomment the next 2 lines to include support for Microsoft's	38	# Uncomment the next 2 lines to include support for Microsoft's
Lines 206-212 Link Here
206	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)	206	$(INSTALL) -c -m 444 pppd.8 $(MANDIR)
207		207
208	pppd: $(PPPDOBJS)	208	pppd: $(PPPDOBJS)
209	$(CC) $(CFLAGS) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)	209	$(CC) $(LDFLAGS) -o pppd $(PPPDOBJS) $(LIBS)
210		210
211	srp-entry: srp-entry.c	211	srp-entry: srp-entry.c
212	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)	212	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ srp-entry.c $(LIBS)
213	-- pppd/plugins/Makefile.linux	213	++ pppd/plugins/Makefile.linux
Lines 1-7 Link Here
1	CC = gcc	1	# CC = gcc
2	COPTS = -O2 -g
3	CFLAGS = $(COPTS) -I.. -I../../include -fPIC	2	CFLAGS = $(COPTS) -I.. -I../../include -fPIC
4	LDFLAGS = -shared	3	LIBS =
5	INSTALL = install	4	INSTALL = install
6		5
7	DESTDIR = $(INSTROOT)@DESTDIR@	6	DESTDIR = $(INSTROOT)@DESTDIR@
Lines 23-29 Link Here
23	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done	22	for d in $(SUBDIRS); do $(MAKE) $(MFLAGS) -C $$d all; done
24		23
25	%.so: %.c	24	%.so: %.c
26	$(CC) -o $@ $(LDFLAGS) $(CFLAGS) $^	25	$(CC) -shared $(LDFLAGS) $(CFLAGS) -o $@ $^ $(LIBS)
27		26
28	VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)	27	VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../patchlevel.h)
29		28
30	-- pppd/plugins/pppoatm/Makefile.linux	29	++ pppd/plugins/pppoatm/Makefile.linux
Lines 1-7 Link Here
1	CC = gcc	1	# CC = gcc
2	COPTS = -O2 -g
3	CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC	2	CFLAGS = $(COPTS) -I../.. -I../../../include -fPIC
4	LDFLAGS = -shared
5	INSTALL = install	3	INSTALL = install
6		4
7	#***********************************************************************	5	#***********************************************************************
Lines 33-39 Link Here
33	all: $(PLUGIN)	31	all: $(PLUGIN)
34		32
35	$(PLUGIN): $(PLUGIN_OBJS)	33	$(PLUGIN): $(PLUGIN_OBJS)
36	$(CC) $(CFLAGS) -o $@ -shared $^ $(LIBS)	34	$(CC) -shared $(LDFLAGS) -o $@ $^ $(LIBS)
37		35
38	install: all	36	install: all
39	$(INSTALL) -d -m 755 $(LIBDIR)	37	$(INSTALL) -d -m 755 $(LIBDIR)
40	-- pppd/plugins/radius/Makefile.linux	38	++ pppd/plugins/radius/Makefile.linux
Lines 12-18 Link Here
12	INSTALL = install	12	INSTALL = install
13		13
14	PLUGIN=radius.so radattr.so radrealms.so	14	PLUGIN=radius.so radattr.so radrealms.so
15	CFLAGS=-I. -I../.. -I../../../include -O2 -fPIC -DRC_LOG_FACILITY=LOG_DAEMON	15	CFLAGS=$(COPTS) -I. -I../.. -I../../../include -fPIC -DRC_LOG_FACILITY=LOG_DAEMON
16		16
17	# Uncomment the next line to include support for Microsoft's	17	# Uncomment the next line to include support for Microsoft's
18	# MS-CHAP authentication protocol.	18	# MS-CHAP authentication protocol.
Lines 43-55 Link Here
43	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)	43	$(INSTALL) -c -m 444 pppd-radattr.8 $(MANDIR)
44		44
45	radius.so: radius.o libradiusclient.a	45	radius.so: radius.o libradiusclient.a
46	$(CC) -o radius.so -shared radius.o libradiusclient.a	46	$(CC) -shared $(LDFLAGS) -o $@ $^
47		47
48	radattr.so: radattr.o	48	radattr.so: radattr.o
49	$(CC) -o radattr.so -shared radattr.o	49	$(CC) -shared $(LDFLAGS) -o $@ $^
50		50
51	radrealms.so: radrealms.o	51	radrealms.so: radrealms.o
52	$(CC) -o radrealms.so -shared radrealms.o	52	$(CC) -shared $(LDFLAGS) -o $@ $^
53		53
54	CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \	54	CLIENTOBJS = avpair.o buildreq.o config.o dict.o ip_util.o \
55	clientid.o sendserver.o lock.o util.o md5.o	55	clientid.o sendserver.o lock.o util.o md5.o
56	-- pppd/plugins/rp-pppoe/Makefile.linux	56	++ pppd/plugins/rp-pppoe/Makefile.linux
Lines 24-41 Link Here
24	# Version is set ONLY IN THE MAKEFILE! Don't delete this!	24	# Version is set ONLY IN THE MAKEFILE! Don't delete this!
25	VERSION=3.3	25	VERSION=3.3
26		26
27	COPTS=-O2 -g
28	CFLAGS=$(COPTS) -I../../../include/linux	27	CFLAGS=$(COPTS) -I../../../include/linux
29	all: rp-pppoe.so pppoe-discovery	28	all: rp-pppoe.so pppoe-discovery
30		29
31	pppoe-discovery: libplugin.a pppoe-discovery.o	30	pppoe-discovery: libplugin.a pppoe-discovery.o
32	$(CC) -o pppoe-discovery pppoe-discovery.o libplugin.a	31	$(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o libplugin.a
33		32
34	pppoe-discovery.o: pppoe-discovery.c	33	pppoe-discovery.o: pppoe-discovery.c
35	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c	34	$(CC) $(CFLAGS) '-DVERSION="$(VERSION)"' -c -o pppoe-discovery.o pppoe-discovery.c
36		35
37	rp-pppoe.so: libplugin.a plugin.o	36	rp-pppoe.so: libplugin.a plugin.o
38	$(CC) -o rp-pppoe.so -shared plugin.o libplugin.a	37	$(CC) -shared $(LDFLAGS) -o rp-pppoe.so plugin.o libplugin.a
39		38
40	install: all	39	install: all
41	$(INSTALL) -d -m 755 $(LIBDIR)	40	$(INSTALL) -d -m 755 $(LIBDIR)
42	-- pppdump/Makefile.linux	41	++ pppdump/Makefile.linux
Lines 2-8 Link Here
2	BINDIR = $(DESTDIR)/sbin	2	BINDIR = $(DESTDIR)/sbin
3	MANDIR = $(DESTDIR)/share/man/man8	3	MANDIR = $(DESTDIR)/share/man/man8
4		4
5	CFLAGS= -O -I../include/net	5	CFLAGS=$(COPTS) -I../include/net
6	OBJS = pppdump.o bsd-comp.o deflate.o zlib.o	6	OBJS = pppdump.o bsd-comp.o deflate.o zlib.o
7		7
8	INSTALL= install	8	INSTALL= install
Lines 10-16 Link Here
10	all: pppdump	10	all: pppdump
11		11
12	pppdump: $(OBJS)	12	pppdump: $(OBJS)
13	$(CC) -o pppdump $(OBJS)	13	$(CC) $(LDFLAGS) -o pppdump $(OBJS)
14		14
15	clean:	15	clean:
16	rm -f pppdump $(OBJS) *~	16	rm -f pppdump $(OBJS) *~
17	-- pppstats/Makefile.linux	17	++ pppstats/Makefile.linux
Lines 10-16 Link Here
10	PPPSTATOBJS = pppstats.o	10	PPPSTATOBJS = pppstats.o
11		11
12	#CC = gcc	12	#CC = gcc
13	COPTS = -O
14	COMPILE_FLAGS = -I../include	13	COMPILE_FLAGS = -I../include
15	LIBS =	14	LIBS =
16		15
Lines 26-32 Link Here
26	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)	25	$(INSTALL) -c -m 444 pppstats.8 $(MANDIR)
27		26
28	pppstats: $(PPPSTATSRCS)	27	pppstats: $(PPPSTATSRCS)
29	$(CC) $(CFLAGS) -o pppstats pppstats.c $(LIBS)	28	$(CC) $(CFLAGS) $(LDFLAGS) -o pppstats pppstats.c $(LIBS)
30		29
31	clean:	30	clean:
32	rm -f pppstats ~ # core	31	rm -f pppstats ~ # core