From 313eb0443e2d10242c483e6c1ee69b6ac6fbcf8f Mon Sep 17 00:00:00 2001 From: michael Date: Sun, 16 Aug 1998 10:22:57 +0000 Subject: [PATCH] Added library support, and smartlinking --- rtl/linux/makefile | 45 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 42 insertions(+), 3 deletions(-) diff --git a/rtl/linux/makefile b/rtl/linux/makefile index a493fbaf24..daf01de88f 100644 --- a/rtl/linux/makefile +++ b/rtl/linux/makefile @@ -37,6 +37,22 @@ CPU=i386 #CPU=m68k endif +# Do you want smartlinking enabled (YES/NO) ? +ifndef SMARTLINK +SMARTLINK=YES +endif + +# Name of library ? +# If this is set, all units will be put in the same library. +# If it is empty (default), the units will be left in separate files. +LIBNAME= +#LIBNAME=fpc + +# Should the library be shared or static (only if LIBNAME is set). +# Set this to 'shared' or 'static'. +# Setting this to shared will disable smart linking. +LIBTYPE=shared + # What compiler to use ? ifndef PP PP=ppc386 @@ -53,8 +69,6 @@ ifndef PPUMOVE PPUMOVE=ppumove endif -# Set this to 'shared' or 'static' -LIBTYPE=shared # AOUT should be defined in main makefile. # But you can set it here too. @@ -113,6 +127,28 @@ ifeq ($(LINK_TO_C),YES) override OPT:=$(OPT) -dCRTLIB endif + +# Smart linking requested ? +ifeq ($(SMARTLINK),YES) +# no use with shared libs. +ifneq ($(LIBNAME),) +ifneq ($(LIBTYPE),shared) +override OPT:=$(OPT) -Xl +endif +else +override OPT:=$(OPT) -Xl +endif +endif + +ifneq ($(LIBNAME),) +override OPT:=$(OPT) -o$(LIBNAME) +ifeq ($(LIBTYPE),shared) +override OPT:=$(OPT) -CD +else +override OPT:=$(OPT) -CS +endif +endif + # Define Linux Units SYSTEMPPU=syslinux$(PPUEXT) OBJECTS=strings linux objpas sysutils math\ @@ -296,7 +332,10 @@ include $(CFG)/makefile.def # # $Log$ -# Revision 1.17 1998-08-15 17:08:09 peter +# Revision 1.18 1998-08-16 10:22:57 michael +# Added library support, and smartlinking +# +# Revision 1.17 1998/08/15 17:08:09 peter # + support for cprt0.o # # \ No newline at end of file