paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-27 21:10:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed (hopefully) problem with dependencies

Browse Source 
git-svn-id: trunk@2220 -
This commit is contained in:
florian 2006-01-08 12:02:57 +00:00
parent af9d6344b8
commit 8039c477af
2 changed files with 2186 additions and 2185 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/base/graph/Makefile
View File

@ -1,5 +1,5 @@
# #
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/05] # Don't edit, this file is generated by FPCMake Version 2.0.0 [2005/11/12]
# #
default: all 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-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux 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-emx i386-watcom i386-netwlibc i386-wince m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos powerpc-linux powerpc-netbsd powerpc-macos powerpc-darwin powerpc-morphos sparc-linux sparc-netbsd sparc-solaris x86_64-linux x86_64-freebsd x86_64-win64 arm-linux arm-wince powerpc64-linux
@ -242,6 +242,7 @@ GRAPH_UNIT=graph
GRAPHUNIT_DIR=$(OS_TARGET) GRAPHUNIT_DIR=$(OS_TARGET)
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
GRAPHUNIT_DIR=unix GRAPHUNIT_DIR=unix
UNIXINCDEPS=$(UNIXINC)/graph16.inc
ifeq ($(CPU_TARGET),powerpc64) ifeq ($(CPU_TARGET),powerpc64)
GGIGRAPH_UNIT= GGIGRAPH_UNIT=
endif endif
@ -251,6 +252,7 @@ endif
endif endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
GRAPHUNIT_DIR=unix GRAPHUNIT_DIR=unix
UNIXINCDEPS=$(UNIXINC)/graph16.inc
endif endif
ifeq ($(FULL_TARGET),i386-linux) ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT) override TARGET_UNITS+=$(GRPAH_UNIT) $(GGIGRAPH_UNIT)
@ -938,11 +940,6 @@ GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
endif endif
endif endif
endif endif
ifeq ($(CPU_TARGET),powerpc64)
ifeq ($(BINUTILSPREFIX),)
GCCLIBDIR:=$(shell dirname `gcc -m64 -print-libgcc-file-name`)
endif
endif
endif endif
ifndef GCCLIBDIR ifndef GCCLIBDIR
CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH)))) CROSSGCC=$(strip $(wildcard $(addsuffix /$(BINUTILSPREFIX)gcc$(SRCEXEEXT),$(SEARCHPATH))))
@ -2172,8 +2169,8 @@ ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc include fpcmake.loc
endif endif
include inc/makefile.inc include inc/makefile.inc
GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) $(UNIXINCDEPS)
graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS) $(UNIXINC)/graph16.inc graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp $(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS) ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp $(COMPILER) -I$(GRAPHDIR) $(UNIXINC)/ggigraph.pp

8
packages/base/graph/Makefile.fpc
View File

@ -55,9 +55,12 @@ GRAPHUNIT_DIR=$(OS_TARGET)
ifeq ($(OS_TARGET),linux) ifeq ($(OS_TARGET),linux)
GRAPHUNIT_DIR=unix GRAPHUNIT_DIR=unix
UNIXINCDEPS=$(UNIXINC)/graph16.inc
ifeq ($(CPU_TARGET),powerpc64) ifeq ($(CPU_TARGET),powerpc64)
GGIGRAPH_UNIT= GGIGRAPH_UNIT=
endif endif
ifneq ($(CPU_TARGET),i386) ifneq ($(CPU_TARGET),i386)
GRAPH_UNIT= GRAPH_UNIT=
endif endif
@ -65,13 +68,14 @@ endif
ifeq ($(OS_TARGET),freebsd) ifeq ($(OS_TARGET),freebsd)
GRAPHUNIT_DIR=unix GRAPHUNIT_DIR=unix
UNIXINCDEPS=$(UNIXINC)/graph16.inc
endif endif
[rules] [rules]
include inc/makefile.inc include inc/makefile.inc
GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) GRAPHINCDEPS=$(addprefix $(GRAPHDIR)/,$(GRAPHINCNAMES)) $(UNIXINCDEPS)
graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS) $(UNIXINC)/graph16.inc graph$(PPUEXT) : graph.pp $(GRAPHINCDEPS)
$(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp $(COMPILER) -I$(GRAPHDIR) $(GRAPHUNIT_DIR)/graph.pp
ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS) ggigraph$(PPUEXT) : $(UNIXINC)/ggigraph.pp $(GRAPHINCDEPS)