From de47eb59bb829423b1d0f47ba13099073999b3cb Mon Sep 17 00:00:00 2001
From: Nicolas Planel <nplanel@mandriva.com>
Date: Wed, 29 Oct 2003 16:07:11 +0000
Subject: Corporate Server 2.1.1 release

---
 mdk-stage1/rp-pppoe/src/Makefile | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

(limited to 'mdk-stage1/rp-pppoe/src/Makefile')

diff --git a/mdk-stage1/rp-pppoe/src/Makefile b/mdk-stage1/rp-pppoe/src/Makefile
index f96b5714e..11d2684d6 100644
--- a/mdk-stage1/rp-pppoe/src/Makefile
+++ b/mdk-stage1/rp-pppoe/src/Makefile
@@ -20,39 +20,26 @@ include $(top_dir)/Makefile.common
 
 TARGETS = pppoe
 
-ifeq (DIETLIBC, $(L))
-TARGETS += pppoe-DIET
-endif
-
 BINTARGET = ../pppoe-bin
 
 
 all: $(TARGETS)
 
 clean:
-	rm -f *.o *.a $(BINTARGET) pppoe pppoe-DIET
+	rm -f *.o *.a $(BINTARGET) pppoe
 
 FLAGS = -Wall -Werror -Os -fomit-frame-pointer '-DPPPOE_PATH="/sbin/pppoe"' '-DPPPD_PATH="/sbin/pppd"' '-DVERSION="3.0-stg1"'
 
-
+ifeq (GLIBC, $(L))
+EXTRA_LDFLAGS = -static
+endif
 
 OBJS = pppoe.o if.o debug.o common.o ppp.o discovery.o
-OBJS-DIET = $(subst .o,-DIET.o,$(OBJS))
-
 
 pppoe: $(OBJS)
-	gcc -static -o $@ $^
-	$(STRIPCMD) $@
-	cp -f $@ $(BINTARGET)
-
-pppoe-DIET: $(OBJS-DIET)
-	gcc $(DIETLIBC_LDFLAGS_STAGE1) -o $@ $^ $(DIETLIBC_LIBC)
+	$(DIET) gcc -o $@ $^ $(EXTRA_LDFLAGS)
 	$(STRIPCMD) $@
 	cp -f $@ $(BINTARGET)
 
 $(OBJS): %.o: %.c
-	gcc $(FLAGS) $(GLIBC_INCLUDES) $(INCS) -c $< -o $@
-
-$(OBJS-DIET): %-DIET.o: %.c
-	gcc $(FLAGS) $(DIETLIBC_INCLUDES) $(INCS) -c $< -o $@
-
+	$(DIET) gcc $(FLAGS) $(INCLUDES) $(INCS) -c $< -o $@
-- 
cgit v1.2.1