* Added console to the unit list

This commit is contained in:
marco 2001-01-20 16:45:09 +00:00
parent cae8881a92
commit bf8951cb31
2 changed files with 17 additions and 58 deletions

View File

@ -1,5 +1,5 @@
# #
# Makefile generated by fpcmake v1.00 [2000/12/22] # Makefile generated by fpcmake v1.00 [2000/12/23]
# #
defaultrule: all defaultrule: all
@ -50,25 +50,6 @@ else
SRCEXEEXT=.exe SRCEXEEXT=.exe
endif endif
# The extension of batch files / scripts
ifdef inUnix
BATCHEXT=.sh
else
ifdef inOS2
BATCHEXT=.cmd
else
BATCHEXT=.bat
endif
endif
# Path Separator, the subst trick is necessary for the \ that can't exists
# at the end of a line
ifdef inUnix
PATHSEP=/
else
PATHSEP=$(subst /,\,/)
endif
# The path which is searched separated by spaces # The path which is searched separated by spaces
ifdef inUnix ifdef inUnix
SEARCHPATH=$(subst :, ,$(PATH)) SEARCHPATH=$(subst :, ,$(PATH))
@ -221,7 +202,7 @@ endif
# Targets # Targets
override LOADEROBJECTS+=prt0 cprt0 override LOADEROBJECTS+=prt0 cprt0
override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings linux initc dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc terminfo video mouse keyboard override UNITOBJECTS+=$(SYSTEMUNIT) objpas strings linux initc dos crt objects printer sysutils typinfo math cpu mmx getopts heaptrc lineinfo errors sockets gpm ipc terminfo video mouse keyboard console
override RSTOBJECTS+=math override RSTOBJECTS+=math
# Clean # Clean
@ -365,7 +346,15 @@ LD=ld
endif endif
# ppas.bat / ppas.sh # ppas.bat / ppas.sh
PPAS=ppas$(BATCHEXT) ifdef inUnix
PPAS=ppas.sh
else
ifdef inOS2
PPAS=ppas.cmd
else
PPAS=ppas.bat
endif
endif
# ldconfig to rebuild .so cache # ldconfig to rebuild .so cache
ifdef inUnix ifdef inUnix
@ -1128,48 +1117,18 @@ USETAR=1
endif endif
endif endif
# Use a wrapper script by default for OS/2
ifdef inOS2
USEZIPWRAPPER=1
endif
# Create commands to create the zip/tar file
ZIPWRAPPER=$(DESTZIPDIR)/fpczip$(BATCHEXT)
ZIPCMD_CDPACK:=cd $(subst /,$(PATHSEP),$(PACKDIR))
ZIPCMD_CDBASE:=cd $(subst /,$(PATHSEP),$(BASEDIR))
ifdef USETAR
ZIPDESTFILE:=$(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
ZIPCMD_ZIP:=$(TARPROG) cf$(TAROPT) $(ZIPDESTFILE) *
else
ZIPDESTFILE:=$(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
ZIPCMD_ZIP:=$(subst /,$(PATHSEP),$(ZIPPROG)) -Dr $(ZIPOPT) $(ZIPDESTFILE) *
endif
fpc_zipinstall: fpc_zipinstall:
ifndef ZIPNAME ifndef ZIPNAME
@$(ECHO) "Please specify ZIPNAME!" @$(ECHO) "Please specify ZIPNAME!"
@exit 1 @exit 1
else else
$(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR) $(MAKE) $(ZIPTARGET) PREFIXINSTALLDIR=$(PACKDIR)
$(DEL) $(ZIPDESTFILE) ifdef USETAR
ifdef USEZIPWRAPPER $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT)
ifneq ($(ECHO),echo) cd $(PACKDIR) ; $(TARPROG) cf$(TAROPT) $(DESTZIPDIR)/$(ZIPNAME)$(TAREXT) * ; cd $(BASEDIR)
$(ECHO) "$(ZIPCMD_CDPACK)" > $(ZIPWRAPPER)
$(ECHO) "$(ZIPCMD_ZIP)" >> $(ZIPWRAPPER)
$(ECHO) "$(ZIPCMD_CDBASE)" >> $(ZIPWRAPPER)
else else
$(ECHO) $(ZIPCMD_CDPACK) > $(ZIPWRAPPER) $(DEL) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT)
$(ECHO) $(ZIPCMD_ZIP) >> $(ZIPWRAPPER) cd $(PACKDIR) ; $(ZIPPROG) -Dr $(ZIPOPT) $(DESTZIPDIR)/$(ZIPNAME)$(ZIPEXT) * ; cd $(BASEDIR)
$(ECHO) $(ZIPCMD_CDBASE) >> $(ZIPWRAPPER)
endif
ifdef inUnix
/bin/sh $(ZIPWRAPPER)
else
$(ZIPWRAPPER)
endif
$(DEL) $(ZIPWRAPPER)
else
$(ZIPCMD_CDPACK) ; $(ZIPCMD_ZIP) ; $(ZIPCMD_CDBASE)
endif endif
$(DELTREE) $(PACKDIR) $(DELTREE) $(PACKDIR)
endif endif

View File

@ -10,7 +10,7 @@ units=$(SYSTEMUNIT) objpas strings \
sysutils typinfo math \ sysutils typinfo math \
cpu mmx getopts heaptrc lineinfo \ cpu mmx getopts heaptrc lineinfo \
errors sockets gpm ipc terminfo \ errors sockets gpm ipc terminfo \
video mouse keyboard video mouse keyboard console
rst=math rst=math