From 0879c2dadfe9f6998bdcddf837918ed8617d17b4 Mon Sep 17 00:00:00 2001
From: Matthias Badaire <mbadaire@mandriva.com>
Date: Wed, 30 May 2001 14:31:23 +0000
Subject: - allow build on ia64 - have CFLAGS centralized in Makefile.common
 (should help ports such as alpha) - better looking sub makefiles

---
 mdk-stage1/slang/Makefile | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'mdk-stage1/slang/Makefile')

diff --git a/mdk-stage1/slang/Makefile b/mdk-stage1/slang/Makefile
index c78ee4668..4cd1dc6bb 100644
--- a/mdk-stage1/slang/Makefile
+++ b/mdk-stage1/slang/Makefile
@@ -18,31 +18,39 @@ top_dir = ..
 include $(top_dir)/Makefile.common
 
 
-all: libslang.a libslang-DIET.a
+LIBNAME = libslang
 
-clean:
-	rm -f *.o *.a
+OBJS = sltermin.o sldisply.o slutty.o slang.o slarray.o slclass.o slcmd.o slerr.o slgetkey.o slkeymap.o slmalloc.o slmath.o slmemchr.o slmemcmp.o slmemcpy.o slmemset.o slmisc.o slparse.o slprepr.o slregexp.o slrline.o slsearch.o slsmg.o slstd.o sltoken.o sltypes.o slxstrng.o slcurses.o slscroll.o slsignal.o slkeypad.o slerrno.o slstring.o slstruct.o slcmplex.o slarrfun.o slimport.o slpath.o slarith.o slassoc.o slcompat.o slposdir.o slstdio.o slproc.o sltime.o slstrops.o slbstr.o slpack.o slintall.o slistruc.o slposio.o slnspace.o slarrmis.o slospath.o slscanf.o
 
-FLAGS = -Wall -Werror -Os -fomit-frame-pointer -Dunix -DSLANG -c
+DEFS = -Dunix -DSLANG
 
+INCS = 
 
-OBJS = sltermin.o sldisply.o slutty.o slang.o slarray.o slclass.o slcmd.o slerr.o slgetkey.o slkeymap.o slmalloc.o slmath.o slmemchr.o slmemcmp.o slmemcpy.o slmemset.o slmisc.o slparse.o slprepr.o slregexp.o slrline.o slsearch.o slsmg.o slstd.o sltoken.o sltypes.o slxstrng.o slcurses.o slscroll.o slsignal.o slkeypad.o slerrno.o slstring.o slstruct.o slcmplex.o slarrfun.o slimport.o slpath.o slarith.o slassoc.o slcompat.o slposdir.o slstdio.o slproc.o sltime.o slstrops.o slbstr.o slpack.o slintall.o slistruc.o slposio.o slnspace.o slarrmis.o slospath.o slscanf.o
 
-OBJS-DIET = $(subst .o,-DIET.o,$(OBJS))
+TARGETS = $(LIBNAME).a
+
+ifeq (DIETLIBC, $(L))
+TARGETS += $(LIBNAME)-DIET.a
+endif
 
+all: $(TARGETS)
 
-libslang.a: $(OBJS)
+clean:
+	rm -f *.o *.a
+
+OBJS-DIET = $(subst .o,-DIET.o,$(OBJS))
+
+$(LIBNAME).a: $(OBJS)
 	ar -cru $@ $^
 	ranlib $@
 
-libslang-DIET.a: $(OBJS-DIET)
+$(LIBNAME)-DIET.a: $(OBJS-DIET)
 	ar -cru $@ $^
 	ranlib $@
 
-
 $(OBJS): %.o: %.c
-	gcc $(FLAGS) $(GLIBC_INCLUDES) -c $< -o $@
+	gcc $(CFLAGS) $(DEFS) $(INCS) $(GLIBC_INCLUDES) -c $< -o $@
 
 $(OBJS-DIET): %-DIET.o: %.c
-	gcc $(FLAGS)  $(DIETLIBC_INCLUDES) -c $< -o $@
+	gcc $(CFLAGS) $(DEFS) $(INCS) $(DIETLIBC_INCLUDES) -c $< -o $@
 
-- 
cgit v1.2.1