Browse Source

* Added gtkshedit for Linux

sg 26 years ago
parent
commit
13c71bc1b3
1 changed files with 28 additions and 11 deletions
  1. 28 11
      fcl/shedit/Makefile

+ 28 - 11
fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
+# Makefile generated by fpcmake v0.99.13 on 1999-12-12 18:45
 #
 #
 
 
 defaultrule: all
 defaultrule: all
@@ -65,12 +65,17 @@ endif
 
 
 # What compiler to use ?
 # What compiler to use ?
 ifndef FPC
 ifndef FPC
+# Compatibility with old makefiles
+ifdef PP
+export FPC=$(PP)
+else
 ifdef inOS2
 ifdef inOS2
 export FPC=ppos2$(EXEEXT)
 export FPC=ppos2$(EXEEXT)
 else
 else
 export FPC=ppc386$(EXEEXT)
 export FPC=ppc386$(EXEEXT)
 endif
 endif
 endif
 endif
+endif
 
 
 # Target OS
 # Target OS
 ifndef OS_TARGET
 ifndef OS_TARGET
@@ -133,6 +138,9 @@ endif
 
 
 override UNITOBJECTS+=doc_text shedit sh_pas sh_xml
 override UNITOBJECTS+=doc_text shedit sh_pas sh_xml
 ifeq ($(OS_TARGET),linux)
 ifeq ($(OS_TARGET),linux)
+override UNITOBJECTS+=gtkshedit
+endif
+ifeq ($(OS_TARGET),linux)
 override EXEOBJECTS+=gtkdemo
 override EXEOBJECTS+=gtkdemo
 endif
 endif
 ifeq ($(OS_TARGET),win32)
 ifeq ($(OS_TARGET),win32)
@@ -209,6 +217,7 @@ endif
 
 
 # create fcldir,rtldir,unitdir
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifdef FPCDIR
+override FPCDIR:=$(subst \,/,$(FPCDIR))
 ifneq ($(FPCDIR),.)
 ifneq ($(FPCDIR),.)
 override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
 override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
 override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
 override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
@@ -347,7 +356,15 @@ ifdef CFGFILE
 override FPCOPT+=@$(CFGFILE)
 override FPCOPT+=@$(CFGFILE)
 endif
 endif
 
 
-override COMPILER=$(FPC) $(FPCOPT)
+# For win32 the options are passed using the environment variable FPCEXTCMD
+ifeq ($(OS_SOURCE),win32)
+override FPCEXTCMD:=$(FPCOPT)
+override FPCOPT:=!FPCEXTCMD
+export FPCEXTCMD
+endif
+
+# Compiler commandline
+override COMPILER:=$(FPC) $(FPCOPT)
 
 
 #####################################################################
 #####################################################################
 # Shell tools
 # Shell tools
@@ -439,7 +456,7 @@ endif
 ifeq (,$(findstring -s ,$(COMPILER)))
 ifeq (,$(findstring -s ,$(COMPILER)))
 EXECPPAS=
 EXECPPAS=
 else
 else
-EXECPPAS=@$(PPAS)
+EXECPPAS:=@$(PPAS)
 endif
 endif
 
 
 # ldconfig to rebuild .so cache
 # ldconfig to rebuild .so cache
@@ -766,7 +783,7 @@ fpc_debug:
 
 
 # Default sharedlib units are all unit objects
 # Default sharedlib units are all unit objects
 ifndef SHAREDLIBUNITOBJECTS
 ifndef SHAREDLIBUNITOBJECTS
-SHAREDLIBUNITOBJECTS=$(UNITOBJECTS)
+SHAREDLIBUNITOBJECTS:=$(UNITOBJECTS)
 endif
 endif
 
 
 fpc_smart:
 fpc_smart:
@@ -796,13 +813,13 @@ endif
 ifdef INSTALLPPUFILES
 ifdef INSTALLPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
 ifdef inlinux
 ifdef inlinux
-INSTALLPPULINKFILES=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
-INSTALLPPULIBFILES=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
+INSTALLPPULINKFILES:=$(shell $(PPUFILES) -S -O $(INSTALLPPUFILES))
+INSTALLPPULIBFILES:=$(shell $(PPUFILES) -L $(INSTALLPPUFILES))
 else
 else
-INSTALLPPULINKFILES=$(shell $(PPUFILES) $(INSTALLPPUFILES))
+INSTALLPPULINKFILES:=$(shell $(PPUFILES) $(INSTALLPPUFILES))
 endif
 endif
 else
 else
-INSTALLPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))
+INSTALLPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(INSTALLPPUFILES))
 endif
 endif
 endif
 endif
 
 
@@ -876,7 +893,7 @@ endif
 
 
 # Test dir if none specified
 # Test dir if none specified
 ifndef DESTZIPDIR
 ifndef DESTZIPDIR
-DESTZIPDIR=$(BASEDIR)
+DESTZIPDIR:=$(BASEDIR)
 endif
 endif
 
 
 # Add .zip/.tar.gz extension
 # Add .zip/.tar.gz extension
@@ -931,9 +948,9 @@ endif
 
 
 ifdef CLEANPPUFILES
 ifdef CLEANPPUFILES
 ifdef PPUFILES
 ifdef PPUFILES
-CLEANPPULINKFILES=$(shell $(PPUFILES) $(CLEANPPUFILES))
+CLEANPPULINKFILES:=$(shell $(PPUFILES) $(CLEANPPUFILES))
 else
 else
-CLEANPPULINKFILES=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES))
+CLEANPPULINKFILES:=$(subst $(PPUEXT),$(OEXT),$(CLEANPPUFILES))
 endif
 endif
 endif
 endif