From 62cd2ac16583fae7dd56ba05cf8420109edb3699 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 29 Aug 2004 09:39:52 +0000
Subject: [PATCH] fixed startlazarus compile under MacOSX

git-svn-id: trunk@5882 -
---
 Makefile     | 17 +++++++++--------
 Makefile.fpc | 18 +++++++++++++++++-
 2 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index c4088a0cbe..069b8a99f0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/27]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/08/08]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos
@@ -1832,7 +1832,7 @@ endif
 .PHONY: fpc_examples
 ifneq ($(TARGET_EXAMPLES),)
 HASEXAMPLES=1
-override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .lpr,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
+override EXAMPLESOURCEFILES:=$(wildcard $(addsuffix .pp,$(TARGET_EXAMPLES)) $(addsuffix .pas,$(TARGET_EXAMPLES)) $(addsuffix .dpr,$(TARGET_EXAMPLES)))
 override EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
 override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
 override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
@@ -1857,7 +1857,7 @@ fpc_debug:
 	$(MAKE) all DEBUG=1
 fpc_release:
 	$(MAKE) all RELEASE=1
-.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .lpr .dpr .pp .rc .res
+.SUFFIXES: $(EXEEXT) $(PPUEXT) $(OEXT) .pas .dpr .pp .rc .res
 %$(PPUEXT): %.pp
 	$(COMPILER) $<
 	$(EXECPPAS)
@@ -1870,9 +1870,6 @@ fpc_release:
 %$(EXEEXT): %.pas
 	$(COMPILER) $<
 	$(EXECPPAS)
-%$(EXEEXT): %.lpr
-	$(COMPILER) $<
-	$(EXECPPAS)
 %$(EXEEXT): %.dpr
 	$(COMPILER) $<
 	$(EXECPPAS)
@@ -1880,7 +1877,6 @@ fpc_release:
 	windres -i $< -o $@
 vpath %.pp $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.pas $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
-vpath %.lpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %.dpr $(COMPILER_SOURCEDIR) $(COMPILER_INCLUDEDIR)
 vpath %$(PPUEXT) $(COMPILER_UNITTARGETDIR)
 .PHONY: fpc_install fpc_sourceinstall fpc_exampleinstall
@@ -2529,7 +2525,11 @@ endif
 idepkg:
 	$(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT) @$(LAZARUS_IDE_CONFIG)'
 starter: lcl
-	$(MAKE) startlazarus$(EXEEXT)
+ifeq ($(LAZARUS_OPT),)
+	$(MAKE) --assume-new=startlazarus.pp startlazarus$(EXEEXT)
+else
+	$(MAKE) --assume-new=startlazarus.pp startlazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT)'
+endif
 tools: lcl components
 	$(MAKE) -C tools
 all: lcl components packager/registration ideintf designer packager ide starter
@@ -2553,3 +2553,4 @@ clean: cleanall cleanide
 purge: cleanall cleanide
 	$(MAKE) -C examples clean
 	$(MAKE) -C tools clean
+	$(DEL) startlazarus$(EXEEXT)
diff --git a/Makefile.fpc b/Makefile.fpc
index 5086afa6d4..2df71b7ede 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -42,6 +42,7 @@ destdir=$(BASEDIR)/dist
 
 [prerules]
 RCPP?=$(strip $(firstword $(wildcard $(addsuffix /cpp$(SRCEXEEXT), $(SEARCHPATH)))))
+#
 # LCL Platform
 ifndef LCL_PLATFORM
 ifeq ($(OS_TARGET),win32)
@@ -52,10 +53,12 @@ override COMPILER_UNITDIR+=lcl/nonwin32
 endif
 endif
 export LCL_PLATFORM
+#
 # LibPaths
 ifeq ($(OS_TARGET),darwin)
 LAZARUS_LIBPATHS=-Fl/usr/X11R6/lib -Fl/sw/lib
 endif
+#
 # user config
 ifndef LAZARUS_CONFIG_DIR
 ifeq ($(OS_TARGET),win32)
@@ -65,10 +68,12 @@ LAZARUS_CONFIG_DIR=$(HOME)/.lazarus
 endif
 endif
 export LAZARUS_CONFIG_DIR
+#
 # idemake.cfg
 LAZARUS_IDE_CONFIG=$(LAZARUS_CONFIG_DIR)/idemake.cfg
 LAZARUS_OPT=$(LAZARUS_LIBPATHS)
 
+#-----------------------------------------------------------------------------
 [rules]
 .PHONY: lcl components packager/registration ideintf packager ide idepkg starter tools all clean cleanide purge
 .SUFFIXES: .rc .res
@@ -76,6 +81,7 @@ LAZARUS_OPT=$(LAZARUS_LIBPATHS)
 %.res: %.rc
         windres -i $< -o $@ --preprocessor $(RCPP)
 
+#-----------------------------------------------------------------------------
 ide:
 ifeq ($(OS_TARGET), win32)
         $(MAKE) lazarus.res
@@ -86,17 +92,26 @@ else
         $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT)'
 endif
 
+#-----------------------------------------------------------------------------
 idepkg:
         $(MAKE) --assume-new=lazarus.pp lazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT) @$(LAZARUS_IDE_CONFIG)'
 
+#-----------------------------------------------------------------------------
 starter: lcl
-	$(MAKE) startlazarus$(EXEEXT)
+ifeq ($(LAZARUS_OPT),)
+        $(MAKE) --assume-new=startlazarus.pp startlazarus$(EXEEXT)
+else
+        $(MAKE) --assume-new=startlazarus.pp startlazarus$(EXEEXT) OPT='$(OPT) $(LAZARUS_OPT)'
+endif
 
+#-----------------------------------------------------------------------------
 tools: lcl components
         $(MAKE) -C tools
 
+#-----------------------------------------------------------------------------
 all: lcl components packager/registration ideintf designer packager ide starter
 
+#-----------------------------------------------------------------------------
 cleanide:
         $(DEL) $(wildcard *$(OEXT))
         $(DEL) $(wildcard *$(PPUEXT))
@@ -119,6 +134,7 @@ clean: cleanall cleanide
 purge: cleanall cleanide
         $(MAKE) -C examples clean
         $(MAKE) -C tools clean
+        $(DEL) startlazarus$(EXEEXT)
 
 #install: $(INSTALLTARGET) $(addsuffix _install,$(TARGET_DIRS))
 # end.