Browse Source

* remove superfluous texts after endif

git-svn-id: trunk@23999 -
florian 12 years ago
parent
commit
4328e8c7b8
2 changed files with 18 additions and 14 deletions
  1. 12 8
      rtl/linux/Makefile
  2. 6 6
      rtl/linux/Makefile.fpc

+ 12 - 8
rtl/linux/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/03/17]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-22 rev 23962]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim i386-android m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) solaris qnx haiku aix 
+UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
@@ -2681,7 +2681,11 @@ AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
 AR=$(ARPROG)
+ifdef inUnix
+PPAS=./ppas$(SRCBATCHEXT)
+else
 PPAS=ppas$(SRCBATCHEXT)
+endif
 ifdef inUnix
 LDCONFIG=ldconfig
 else
@@ -3286,27 +3290,27 @@ prt0$(OEXT) : $(ARCH)/prt0.as
 dllprt0$(OEXT) : $(ARCH)/dllprt0.as
 ifndef ARMTHUMB
 	$(AS) $(ASTARGET) $(ASSHAREDOPT) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(ARCH)/dllprt0.as
-endif ARMTHUMB
+endif
 gprt0$(OEXT) : $(ARCH)/gprt0.as
 ifndef ARMTHUMB
 	$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)gprt0$(OEXT) $(ARCH)/gprt0.as
-endif ARMTHUMB
+endif
 cprt0$(OEXT) : $(ARCH)/cprt0.as
 ifndef ARMTHUMB
 	$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) $(ARCH)/cprt0.as
-endif ARMTHUMB
+endif
 cprt21$(OEXT) : $(ARCH)/cprt21.as
 ifndef ARMTHUMB
 	$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt21$(OEXT) $(ARCH)/cprt21.as
-endif ARMTHUMB
+endif
 gprt21$(OEXT) : $(ARCH)/gprt21.as
 ifndef ARMTHUMB
 	$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)gprt21$(OEXT) $(ARCH)/gprt21.as
-endif ARMTHUMB
+endif
 ucprt0$(OEXT) : $(ARCH)/ucprt0.as
 ifndef ARMTHUMB
 	$(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)$@ $<
-endif ARMTHUMB
+endif
 $(SYSTEMUNIT)$(PPUEXT) : $(SYSTEMUNIT).pp $(SYSDEPS)
 	$(COMPILER) -Us -Sg $(SYSTEMUNIT).pp
 uuchar$(PPUEXT): $(SYSTEMUNIT)$(PPUEXT) $(INC)/uuchar.pp

+ 6 - 6
rtl/linux/Makefile.fpc

@@ -169,32 +169,32 @@ prt0$(OEXT) : $(ARCH)/prt0.as
 dllprt0$(OEXT) : $(ARCH)/dllprt0.as
 ifndef ARMTHUMB
         $(AS) $(ASTARGET) $(ASSHAREDOPT) -o $(UNITTARGETDIRPREFIX)dllprt0$(OEXT) $(ARCH)/dllprt0.as
-endif ARMTHUMB
+endif
 
 gprt0$(OEXT) : $(ARCH)/gprt0.as
 ifndef ARMTHUMB
         $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)gprt0$(OEXT) $(ARCH)/gprt0.as
-endif ARMTHUMB
+endif
 
 cprt0$(OEXT) : $(ARCH)/cprt0.as
 ifndef ARMTHUMB
         $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt0$(OEXT) $(ARCH)/cprt0.as
-endif ARMTHUMB
+endif
 
 cprt21$(OEXT) : $(ARCH)/cprt21.as
 ifndef ARMTHUMB
         $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)cprt21$(OEXT) $(ARCH)/cprt21.as
-endif ARMTHUMB
+endif
 
 gprt21$(OEXT) : $(ARCH)/gprt21.as
 ifndef ARMTHUMB
         $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)gprt21$(OEXT) $(ARCH)/gprt21.as
-endif ARMTHUMB
+endif
 
 ucprt0$(OEXT) : $(ARCH)/ucprt0.as
 ifndef ARMTHUMB
         $(AS) $(ASTARGET) -o $(UNITTARGETDIRPREFIX)$@ $<
-endif ARMTHUMB
+endif
 
 
 #