This commit is contained in:
peter 1999-06-18 11:03:08 +00:00
parent 04b6a51ed8
commit 15d54cb1d7
6 changed files with 63 additions and 22 deletions

View File

@ -869,16 +869,19 @@ endif
#####################################################################
fpc_clean:
-$(DEL) $(UNITOFILES) $(UNITAFILES) $(UNITFILES) $(PPAS) link.res log
ifeq ($(SMARTLINK),YES)
-$(DELTREE) *$(SMARTEXT)
endif
ifdef UNITOBJECTS
-$(DEL) $(UNITOFILES) $(UNITAFILES) $(UNITFILES)
endif
ifdef EXEOBJECTS
-$(DEL) $(EXEFILES) $(EXEOFILES)
endif
ifdef LOADEROBJECTS
-$(DEL) $(LOADEROFILES)
endif
ifdef EXTRAUNITS
-$(DEL) $(addsuffix $(OEXT),$(EXTRAUNITS)) $(addsuffix $(STATICLIBEXT),$(EXTRAUNITS)) $(addsuffix $(PPUEXT),$(EXTRAUNITS))
endif
-$(DEL) $(PPAS) link.res log
fpc_libsclean: clean
-$(DEL) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
@ -1021,7 +1024,10 @@ endif
#
# $Log$
# Revision 1.34 1999-06-18 10:11:18 peter
# Revision 1.35 1999-06-18 11:03:08 peter
# * merged
#
# Revision 1.34 1999/06/18 10:11:18 peter
# * merged
#
# Revision 1.33 1999/06/13 22:43:23 peter
@ -1030,6 +1036,10 @@ endif
# Revision 1.32 1999/06/11 13:31:14 hajny
# * fixes for OS/2
#
# Revision 1.31.2.3 1999/06/18 10:55:31 peter
# * version fixes
# * EXTRAUNITS to set extra units that are build and needs to be cleaned
#
# Revision 1.31.2.2 1999/06/18 10:07:27 peter
# * rtl/linux and units/linux also for linux installs
#

View File

@ -174,13 +174,13 @@ cat <<EOFCFG > /etc/ppc386.cfg
#IFDEF Linux
# For statically, smartlinked units
#IFDEF FPC_LINK_STATIC
-Fu$1/rtl/static
-Fu$1/units/static
-Fu$1/rtl/linux/static
-Fu$1/units/linux/static
#ENDIF
# For Dynamically linked units
#IFDEF FPC_LINK_DYNAMIC
-Fu$1/rtl/shared
-Fu$1/units/shared
-Fu$1/rtl/linux/shared
-Fu$1/units/linux/shared
#ENDIF
-Fu$1/rtl/linux
-Fu$1/units/linux

View File

@ -249,7 +249,7 @@ end;
procedure UpdateReplacement(var s:string);
begin
Replace(s,'$FPCVER',version_string);
Replace(s,'$FPCVER',full_version_string);
Replace(s,'$FPCDATE',date_string);
Replace(s,'$FPCTARGET',target_cpu_string);
end;
@ -515,7 +515,14 @@ end.
{
$Log$
Revision 1.39 1999-05-08 19:52:42 peter
Revision 1.40 1999-06-18 11:03:09 peter
* merged
Revision 1.39.2.1 1999/06/18 10:55:32 peter
* version fixes
* EXTRAUNITS to set extra units that are build and needs to be cleaned
Revision 1.39 1999/05/08 19:52:42 peter
+ MessagePos() which is enhanced Message() function but also gets the
position info
* Removed comp warnings

View File

@ -31,7 +31,10 @@ interface
version_nr = '0';
release_nr = '99';
patch_nr = '12';
minorpatch = 'a';
version_string = version_nr+'.'+release_nr+'.'+patch_nr;
full_version_string = version_nr+'.'+release_nr+'.'+patch_nr+minorpatch;
{ date string }
{$ifdef FPC}
@ -66,7 +69,17 @@ begin
end.
{
$Log$
Revision 1.6 1999-06-08 12:52:38 peter
Revision 1.7 1999-06-18 11:03:11 peter
* merged
Revision 1.6.2.2 1999/06/18 10:55:34 peter
* version fixes
* EXTRAUNITS to set extra units that are build and needs to be cleaned
Revision 1.6.2.1 1999/06/18 09:54:48 peter
+ minorpatch which is 'a' for 0.99.12a
Revision 1.6 1999/06/08 12:52:38 peter
* 0.99.12
Revision 1.5 1998/12/23 14:02:01 peter

View File

@ -28,6 +28,7 @@ DEFAULTFPCDIR=..
EXEOBJECTS=ppudump ppumove ppdep ptop
UNITOBJECTS=
EXTRAUNITS=ppu ptopu
#####################################################################
# Common targets
@ -41,7 +42,7 @@ UNITOBJECTS=
all: testfpcmake fpc_all h2pas_all
clean: testfpcmake fpc_clean extra_clean h2pas_clean
clean: testfpcmake fpc_clean h2pas_clean
install: testfpcmake fpc_install h2pas_install
@ -119,12 +120,6 @@ ptop$(EXEEXT): ptop.pp ptopu$(PPUEXT)
ptopu$(PPUEXT): ptopu.pp
#
# Clean also the .ppu's
#
extra_clean:
$(DEL) ppu$(PPUEXT) ptopu$(PPUEXT)
#
# H2Pas
#
@ -139,7 +134,14 @@ h2pas_install:
#
# $Log$
# Revision 1.1 1999-05-12 16:11:39 peter
# Revision 1.2 1999-06-18 11:03:13 peter
# * merged
#
# Revision 1.1.2.1 1999/06/18 10:55:36 peter
# * version fixes
# * EXTRAUNITS to set extra units that are build and needs to be cleaned
#
# Revision 1.1 1999/05/12 16:11:39 peter
# * moved
#
# Revision 1.14 1999/05/03 18:03:13 peter

View File

@ -34,6 +34,8 @@ PASEXT=.pas
EXEOBJECTS=h2pas
UNITOBJECTS=
EXTRAUNITS=options lexlib scan yacclib converu
#####################################################################
# Common targets
@ -45,7 +47,7 @@ UNITOBJECTS=
all: testfpcmake fpc_all
clean: testfpcmake fpc_cleanall
clean: testfpcmake fpc_clean
install: testfpcmake fpc_install
@ -147,7 +149,14 @@ endif
#
# $Log$
# Revision 1.1 1999-05-12 16:11:39 peter
# Revision 1.2 1999-06-18 11:03:14 peter
# * merged
#
# Revision 1.1.2.1 1999/06/18 10:55:37 peter
# * version fixes
# * EXTRAUNITS to set extra units that are build and needs to be cleaned
#
# Revision 1.1 1999/05/12 16:11:39 peter
# * moved
#
# Revision 1.12 1999/04/01 22:52:01 peter