Messages in this thread Patch in this message | | | Date | Tue, 6 Jan 1998 12:11:04 -0600 | From | Michael Elizabeth Chastain <> | Subject | PATCH: make-ppp.2178: drivers/net/Makefile CONFIG_PPP=y fix |
| |
Hi guys,
<ftp://ftp.shout.net/pub/users/mec/patch/make-ppp.2178>
This patch fixes a simple bug in drivers/net/Makefile when CONFIG_PPP=y. This bug caused 'make' to build ppp_deflate.o both as resident and as module. Often, 'make modules_install' would pick up the resident version, leading to a bogus module.
The patch is short so I've appended it here too.
As always, I solicit your test reports.
Michael Chastain <mailto:mec@shout.net> "love without fear"
===
--- linux-2.1.78/drivers/net/Makefile Mon Jan 5 03:41:01 1998 +++ linux/drivers/net/Makefile Tue Jan 6 01:08:30 1998 @@ -185,8 +185,11 @@ endif endif +# bsd_comp.o is *always* a module, for some undocumented reason +# (perhaps licensing). ifeq ($(CONFIG_PPP),y) LX_OBJS += ppp.o +M_OBJS += bsd_comp.o CONFIG_SLHC_BUILTIN = y CONFIG_PPPDEF_BUILTIN = y else @@ -194,11 +197,8 @@ CONFIG_SLHC_MODULE = y CONFIG_PPPDEF_MODULE = y MX_OBJS += ppp.o + M_OBJS += bsd_comp.o endif -endif - -ifdef CONFIG_PPP - M_OBJS += bsd_comp.o ppp_deflate.o endif ifeq ($(CONFIG_SLIP),y)
| |