ソースを参照

* Fixed makefile

git-svn-id: trunk@22197 -
michael 13 年 前
コミット
20c0a14e1e
2 ファイル変更67 行追加67 行削除
  1. 64 64
      utils/pas2fpm/Makefile
  2. 3 3
      utils/pas2fpm/Makefile.fpc

+ 64 - 64
utils/pas2fpm/Makefile

@@ -301,193 +301,193 @@ endif
 override PACKAGE_NAME=pas2fpm
 override PACKAGE_VERSION=2.7.1
 ifeq ($(FULL_TARGET),i386-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-go32v2)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-win32)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-os2)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-freebsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-beos)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-haiku)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-netbsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-netware)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-openbsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-wdosx)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-darwin)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-emx)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-watcom)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-netwlibc)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-wince)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-symbian)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-nativent)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),i386-iphonesim)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-freebsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-netbsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-amiga)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-atari)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-openbsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-palmos)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),m68k-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-netbsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-amiga)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-macos)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-darwin)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-morphos)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc-wii)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),sparc-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),sparc-netbsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),x86_64-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),x86_64-freebsd)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),x86_64-win64)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),x86_64-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-palmos)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-darwin)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-wince)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-gba)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-nds)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),arm-symbian)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc64-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc64-darwin)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),powerpc64-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),avr-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),armeb-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),armeb-embedded)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 ifeq ($(FULL_TARGET),mipsel-linux)
-override TARGET_PROGRAMS+=pas2ut
+override TARGET_PROGRAMS+=pas2fpm
 endif
 override INSTALL_FPCPACKAGE=y
 ifeq ($(FULL_TARGET),i386-linux)
@@ -2642,4 +2642,4 @@ ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 endif
 .NOTPARALLEL:
-pas2ut$(EXEEXT): pas2fpm.pp
+pas2fm$(EXEEXT): pas2fpm.pp

+ 3 - 3
utils/pas2fpm/Makefile.fpc

@@ -10,8 +10,8 @@ version=2.7.1
 packages=fcl-passrc
 
 [target]
-programs=pas2ut
-rst=pas2ut
+programs=pas2fpm
+rst=pas2fpm
 
 [compiler]
 options=-S2h
@@ -24,5 +24,5 @@ fpcdir=../..
 
 [rules]
 .NOTPARALLEL:
-pas2ut$(EXEEXT): pas2fpm.pp
+pas2fm$(EXEEXT): pas2fpm.pp