Browse Source

* install does not a build anymore

git-svn-id: trunk@9123 -
peter 18 years ago
parent
commit
6fcdfee5ec
4 changed files with 268 additions and 265 deletions
  1. 2 2
      utils/fppkg/Makefile
  2. 3 1
      utils/fppkg/Makefile.fpc
  3. 263 261
      utils/fppkg/fpmkunitsrc.inc
  4. 0 1
      utils/fppkg/pkgcommands.pp

+ 2 - 2
utils/fppkg/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/10/29]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2007/11/02]
 #
 default: all
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded
@@ -3602,4 +3602,4 @@ ifneq ($(DATA2INC),)
 fpmkunitsrc.inc: $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp
 	$(DATA2INC) -b -s $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp fpmkunitsrc.inc fpmkunitsrc
 endif
-fppkg$(EXEEXT): $(wildcard pkg*.pp) fpmkunitsrc.inc
+fppkg$(EXEEXT): $(wildcard pkg*.pp)

+ 3 - 1
utils/fppkg/Makefile.fpc

@@ -55,4 +55,6 @@ fpmkunitsrc.inc: $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp
         $(DATA2INC) -b -s $(DEFAULT_FPCDIR)/packages/fpmkunit/src/fpmkunit.pp fpmkunitsrc.inc fpmkunitsrc
 endif
 
-fppkg$(EXEEXT): $(wildcard pkg*.pp) fpmkunitsrc.inc
+# Don't include the dependency on fpmkunitsrc.inc by default so we can control
+# better when we want to update the internal fpmkunitsrc
+fppkg$(EXEEXT): $(wildcard pkg*.pp)

File diff suppressed because it is too large
+ 263 - 261
utils/fppkg/fpmkunitsrc.inc


+ 0 - 1
utils/fppkg/pkgcommands.pp

@@ -149,7 +149,6 @@ end;
 
 function TCommandInstall.Execute(const Args:TActionArgs):boolean;
 begin
-  ExecuteAction(CurrentPackage,'build',Args);
   ExecuteAction(CurrentPackage,'fpmakeinstall',Args);
   Result:=true;
 end;

Some files were not shown because too many files changed in this diff