patch-pppd_plugins_rp-pppoe_Makefile_linux 2.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980
  1. --- ppp-2.4.5.orig/pppd/plugins/rp-pppoe/Makefile.linux 2009-11-16 23:26:07.000000000 +0100
  2. +++ ppp-2.4.5/pppd/plugins/rp-pppoe/Makefile.linux 2011-01-16 21:38:08.000000000 +0100
  3. @@ -1,6 +1,3 @@
  4. -# Generated automatically from Makefile.in by configure.
  5. -#***********************************************************************
  6. -#
  7. # Makefile
  8. #
  9. # Makefile for Roaring Penguin's Linux PPPoE plugin.
  10. @@ -13,52 +10,50 @@
  11. #
  12. # $Id: Makefile.linux,v 1.8 2008/06/09 08:34:23 paulus Exp $
  13. #***********************************************************************
  14. -
  15. -DESTDIR = $(INSTROOT)@DESTDIR@
  16. -BINDIR = $(DESTDIR)/sbin
  17. -LIBDIR = $(DESTDIR)/lib/pppd/$(PPPDVERSION)
  18. -
  19. -PPPDVERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  20. -
  21. -INSTALL = install
  22. +include ../../../makedefs.linux
  23. # Version is set ONLY IN THE MAKEFILE! Don't delete this!
  24. RP_VERSION=3.8p
  25. -COPTS=-O2 -g
  26. -CFLAGS=$(COPTS) -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
  27. +CPPFLAGS += -I../../.. -I../../../include '-DRP_VERSION="$(RP_VERSION)"'
  28. +CFLAGS += -fPIC
  29. +LDFLAGS += -shared
  30. +
  31. +VERSION = $(shell awk -F '"' '/VERSION/ { print $$2; }' ../../patchlevel.h)
  32. +
  33. all: rp-pppoe.so pppoe-discovery
  34. pppoe-discovery: pppoe-discovery.o debug.o
  35. - $(CC) -o pppoe-discovery pppoe-discovery.o debug.o
  36. + $(CC) $(LDFLAGS) -o pppoe-discovery pppoe-discovery.o debug.o
  37. pppoe-discovery.o: pppoe-discovery.c
  38. - $(CC) $(CFLAGS) -c -o pppoe-discovery.o pppoe-discovery.c
  39. + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
  40. debug.o: debug.c
  41. - $(CC) $(CFLAGS) -c -o debug.o debug.c
  42. + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $^
  43. rp-pppoe.so: plugin.o discovery.o if.o common.o
  44. - $(CC) -o rp-pppoe.so -shared plugin.o discovery.o if.o common.o
  45. + $(CC) $(LDFLAGS) -o $@ $^
  46. install: all
  47. $(INSTALL) -d -m 755 $(LIBDIR)
  48. - $(INSTALL) -s -c -m 4550 rp-pppoe.so $(LIBDIR)
  49. + $(INSTALL) -c -m 4550 rp-pppoe.so $(LIBDIR)
  50. $(INSTALL) -d -m 755 $(BINDIR)
  51. - $(INSTALL) -s -c -m 555 pppoe-discovery $(BINDIR)
  52. + $(INSTALL) -c -m 555 pppoe-discovery $(BINDIR)
  53. clean:
  54. rm -f *.o *.so pppoe-discovery
  55. plugin.o: plugin.c
  56. - $(CC) $(CFLAGS) -I../../.. -c -o plugin.o -fPIC plugin.c
  57. + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o plugin.o plugin.c
  58. discovery.o: discovery.c
  59. - $(CC) $(CFLAGS) -I../../.. -c -o discovery.o -fPIC discovery.c
  60. + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o discovery.o discovery.c
  61. if.o: if.c
  62. - $(CC) $(CFLAGS) -I../../.. -c -o if.o -fPIC if.c
  63. + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o if.o if.c
  64. common.o: common.c
  65. - $(CC) $(CFLAGS) -I../../.. -c -o common.o -fPIC common.c
  66. + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o common.o common.c
  67. +.PHONY: clean