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/newt/Makefile | 16 +---------------
 mdk-stage1/newt/form.c   |  1 +
 2 files changed, 2 insertions(+), 15 deletions(-)

(limited to 'mdk-stage1/newt')

diff --git a/mdk-stage1/newt/Makefile b/mdk-stage1/newt/Makefile
index 171bcf0cb..b5b3ea8b7 100644
--- a/mdk-stage1/newt/Makefile
+++ b/mdk-stage1/newt/Makefile
@@ -29,28 +29,14 @@ INCS = -I../slang
 
 TARGETS = $(LIBNAME).a
 
-ifeq (DIETLIBC, $(L))
-TARGETS += $(LIBNAME)-DIET.a
-endif
-
 all: $(TARGETS)
 
 clean:
 	rm -f *.o *.a
 
-OBJS-DIET = $(subst .o,-DIET.o,$(OBJS))
-
 $(LIBNAME).a: $(OBJS)
 	ar -cru $@ $^
 	ranlib $@
 
-$(LIBNAME)-DIET.a: $(OBJS-DIET)
-	ar -cru $@ $^
-	ranlib $@
-
 $(OBJS): %.o: %.c
-	gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $< -o $@
-
-$(OBJS-DIET): %-DIET.o: %.c
-	gcc $(CFLAGS) $(DEFS) $(INCS) $(DIETLIBC_INCLUDES) -c $< -o $@
-
+	$(DIET) gcc $(CFLAGS) $(DEFS) $(INCS) $(INCLUDES) -c $< -o $@
diff --git a/mdk-stage1/newt/form.c b/mdk-stage1/newt/form.c
index 4ad465e38..ad7520e95 100644
--- a/mdk-stage1/newt/form.c
+++ b/mdk-stage1/newt/form.c
@@ -2,6 +2,7 @@
 #include <slang.h>
 #include <stdarg.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/time.h>
 #include <sys/types.h>
 
-- 
cgit v1.2.1