Browse Source

* include target dir only for target

peter 24 years ago
parent
commit
472e553555
2 changed files with 134 additions and 101 deletions
  1. 127 99
      rtl/Makefile
  2. 7 2
      rtl/Makefile.fpc

+ 127 - 99
rtl/Makefile

@@ -1,5 +1,5 @@
 #
 #
-# Don't edit, this file is generated by fpcmake v1.99.0 [2001/05/30]
+# Don't edit, this file is generated by fpcmake v1.99.0 [2001/06/02]
 #
 #
 default: all
 default: all
 override PATH:=$(subst \,/,$(PATH))
 override PATH:=$(subst \,/,$(PATH))
@@ -119,8 +119,24 @@ UNITSDIR:=$(wildcard $(FPCDIR)/units/$(OS_TARGET))
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages)
 override PACKAGE_NAME=rtl
 override PACKAGE_NAME=rtl
 override PACKAGE_VERSION=1.0.5
 override PACKAGE_VERSION=1.0.5
-override DEFAULT_DIR=$(OS_TARGET)
-override TARGET_DIRS+=linux win32 go32v2 go32v1 os2 freebsd
+ifeq ($(OS_TARGET),linux)
+override TARGET_DIRS+=linux
+endif
+ifeq ($(OS_TARGET),go32v2)
+override TARGET_DIRS+=go32v2
+endif
+ifeq ($(OS_TARGET),win32)
+override TARGET_DIRS+=win32
+endif
+ifeq ($(OS_TARGET),os2)
+override TARGET_DIRS+=os2
+endif
+ifeq ($(OS_TARGET),freebsd)
+override TARGET_DIRS+=freebsd
+endif
+ifeq ($(OS_TARGET),beos)
+override TARGET_DIRS+=beos
+endif
 override INSTALL_FPCPACKAGE=y
 override INSTALL_FPCPACKAGE=y
 ifndef ECHO
 ifndef ECHO
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
@@ -824,12 +840,24 @@ fpc_info:
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist destination dir. $(DIST_DESTDIR)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)  Dist zip name........ $(DIST_ZIPNAME)
 	@$(ECHO)
 	@$(ECHO)
+ifeq ($(OS_TARGET),linux)
 TARGET_DIRS_LINUX=1
 TARGET_DIRS_LINUX=1
-TARGET_DIRS_WIN32=1
+endif
+ifeq ($(OS_TARGET),go32v2)
 TARGET_DIRS_GO32V2=1
 TARGET_DIRS_GO32V2=1
-TARGET_DIRS_GO32V1=1
+endif
+ifeq ($(OS_TARGET),win32)
+TARGET_DIRS_WIN32=1
+endif
+ifeq ($(OS_TARGET),os2)
 TARGET_DIRS_OS2=1
 TARGET_DIRS_OS2=1
+endif
+ifeq ($(OS_TARGET),freebsd)
 TARGET_DIRS_FREEBSD=1
 TARGET_DIRS_FREEBSD=1
+endif
+ifeq ($(OS_TARGET),beos)
+TARGET_DIRS_BEOS=1
+endif
 ifdef TARGET_DIRS_LINUX
 ifdef TARGET_DIRS_LINUX
 linux_all:
 linux_all:
 	$(MAKE) -C linux all
 	$(MAKE) -C linux all
@@ -869,45 +897,6 @@ linux:
 	$(MAKE) -C linux all
 	$(MAKE) -C linux all
 .PHONY: linux_all linux_debug linux_examples linux_smart linux_shared linux_install linux_sourceinstall linux_exampleinstall linux_distinstall linux_zipinstall linux_zipsourceinstall linux_zipexampleinstall linux_zipdistinstall linux_clean linux_distclean linux_cleanall linux_info linux
 .PHONY: linux_all linux_debug linux_examples linux_smart linux_shared linux_install linux_sourceinstall linux_exampleinstall linux_distinstall linux_zipinstall linux_zipsourceinstall linux_zipexampleinstall linux_zipdistinstall linux_clean linux_distclean linux_cleanall linux_info linux
 endif
 endif
-ifdef TARGET_DIRS_WIN32
-win32_all:
-	$(MAKE) -C win32 all
-win32_debug:
-	$(MAKE) -C win32 debug
-win32_examples:
-	$(MAKE) -C win32 examples
-win32_smart:
-	$(MAKE) -C win32 smart
-win32_shared:
-	$(MAKE) -C win32 shared
-win32_install:
-	$(MAKE) -C win32 install
-win32_sourceinstall:
-	$(MAKE) -C win32 sourceinstall
-win32_exampleinstall:
-	$(MAKE) -C win32 exampleinstall
-win32_distinstall:
-	$(MAKE) -C win32 distinstall
-win32_zipinstall:
-	$(MAKE) -C win32 zipinstall
-win32_zipsourceinstall:
-	$(MAKE) -C win32 zipsourceinstall
-win32_zipexampleinstall:
-	$(MAKE) -C win32 zipexampleinstall
-win32_zipdistinstall:
-	$(MAKE) -C win32 zipdistinstall
-win32_clean:
-	$(MAKE) -C win32 clean
-win32_distclean:
-	$(MAKE) -C win32 distclean
-win32_cleanall:
-	$(MAKE) -C win32 cleanall
-win32_info:
-	$(MAKE) -C win32 info
-win32:
-	$(MAKE) -C win32 all
-.PHONY: win32_all win32_debug win32_examples win32_smart win32_shared win32_install win32_sourceinstall win32_exampleinstall win32_distinstall win32_zipinstall win32_zipsourceinstall win32_zipexampleinstall win32_zipdistinstall win32_clean win32_distclean win32_cleanall win32_info win32
-endif
 ifdef TARGET_DIRS_GO32V2
 ifdef TARGET_DIRS_GO32V2
 go32v2_all:
 go32v2_all:
 	$(MAKE) -C go32v2 all
 	$(MAKE) -C go32v2 all
@@ -947,44 +936,44 @@ go32v2:
 	$(MAKE) -C go32v2 all
 	$(MAKE) -C go32v2 all
 .PHONY: go32v2_all go32v2_debug go32v2_examples go32v2_smart go32v2_shared go32v2_install go32v2_sourceinstall go32v2_exampleinstall go32v2_distinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_zipexampleinstall go32v2_zipdistinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_info go32v2
 .PHONY: go32v2_all go32v2_debug go32v2_examples go32v2_smart go32v2_shared go32v2_install go32v2_sourceinstall go32v2_exampleinstall go32v2_distinstall go32v2_zipinstall go32v2_zipsourceinstall go32v2_zipexampleinstall go32v2_zipdistinstall go32v2_clean go32v2_distclean go32v2_cleanall go32v2_info go32v2
 endif
 endif
-ifdef TARGET_DIRS_GO32V1
-go32v1_all:
-	$(MAKE) -C go32v1 all
-go32v1_debug:
-	$(MAKE) -C go32v1 debug
-go32v1_examples:
-	$(MAKE) -C go32v1 examples
-go32v1_smart:
-	$(MAKE) -C go32v1 smart
-go32v1_shared:
-	$(MAKE) -C go32v1 shared
-go32v1_install:
-	$(MAKE) -C go32v1 install
-go32v1_sourceinstall:
-	$(MAKE) -C go32v1 sourceinstall
-go32v1_exampleinstall:
-	$(MAKE) -C go32v1 exampleinstall
-go32v1_distinstall:
-	$(MAKE) -C go32v1 distinstall
-go32v1_zipinstall:
-	$(MAKE) -C go32v1 zipinstall
-go32v1_zipsourceinstall:
-	$(MAKE) -C go32v1 zipsourceinstall
-go32v1_zipexampleinstall:
-	$(MAKE) -C go32v1 zipexampleinstall
-go32v1_zipdistinstall:
-	$(MAKE) -C go32v1 zipdistinstall
-go32v1_clean:
-	$(MAKE) -C go32v1 clean
-go32v1_distclean:
-	$(MAKE) -C go32v1 distclean
-go32v1_cleanall:
-	$(MAKE) -C go32v1 cleanall
-go32v1_info:
-	$(MAKE) -C go32v1 info
-go32v1:
-	$(MAKE) -C go32v1 all
-.PHONY: go32v1_all go32v1_debug go32v1_examples go32v1_smart go32v1_shared go32v1_install go32v1_sourceinstall go32v1_exampleinstall go32v1_distinstall go32v1_zipinstall go32v1_zipsourceinstall go32v1_zipexampleinstall go32v1_zipdistinstall go32v1_clean go32v1_distclean go32v1_cleanall go32v1_info go32v1
+ifdef TARGET_DIRS_WIN32
+win32_all:
+	$(MAKE) -C win32 all
+win32_debug:
+	$(MAKE) -C win32 debug
+win32_examples:
+	$(MAKE) -C win32 examples
+win32_smart:
+	$(MAKE) -C win32 smart
+win32_shared:
+	$(MAKE) -C win32 shared
+win32_install:
+	$(MAKE) -C win32 install
+win32_sourceinstall:
+	$(MAKE) -C win32 sourceinstall
+win32_exampleinstall:
+	$(MAKE) -C win32 exampleinstall
+win32_distinstall:
+	$(MAKE) -C win32 distinstall
+win32_zipinstall:
+	$(MAKE) -C win32 zipinstall
+win32_zipsourceinstall:
+	$(MAKE) -C win32 zipsourceinstall
+win32_zipexampleinstall:
+	$(MAKE) -C win32 zipexampleinstall
+win32_zipdistinstall:
+	$(MAKE) -C win32 zipdistinstall
+win32_clean:
+	$(MAKE) -C win32 clean
+win32_distclean:
+	$(MAKE) -C win32 distclean
+win32_cleanall:
+	$(MAKE) -C win32 cleanall
+win32_info:
+	$(MAKE) -C win32 info
+win32:
+	$(MAKE) -C win32 all
+.PHONY: win32_all win32_debug win32_examples win32_smart win32_shared win32_install win32_sourceinstall win32_exampleinstall win32_distinstall win32_zipinstall win32_zipsourceinstall win32_zipexampleinstall win32_zipdistinstall win32_clean win32_distclean win32_cleanall win32_info win32
 endif
 endif
 ifdef TARGET_DIRS_OS2
 ifdef TARGET_DIRS_OS2
 os2_all:
 os2_all:
@@ -1064,23 +1053,62 @@ freebsd:
 	$(MAKE) -C freebsd all
 	$(MAKE) -C freebsd all
 .PHONY: freebsd_all freebsd_debug freebsd_examples freebsd_smart freebsd_shared freebsd_install freebsd_sourceinstall freebsd_exampleinstall freebsd_distinstall freebsd_zipinstall freebsd_zipsourceinstall freebsd_zipexampleinstall freebsd_zipdistinstall freebsd_clean freebsd_distclean freebsd_cleanall freebsd_info freebsd
 .PHONY: freebsd_all freebsd_debug freebsd_examples freebsd_smart freebsd_shared freebsd_install freebsd_sourceinstall freebsd_exampleinstall freebsd_distinstall freebsd_zipinstall freebsd_zipsourceinstall freebsd_zipexampleinstall freebsd_zipdistinstall freebsd_clean freebsd_distclean freebsd_cleanall freebsd_info freebsd
 endif
 endif
-all: fpc_all $(addsuffix _all,$(DEFAULT_DIR))
-debug: fpc_debug $(addsuffix _debug,$(DEFAULT_DIR))
-examples: fpc_examples $(addsuffix _examples,$(DEFAULT_DIR))
-smart: fpc_smart $(addsuffix _smart,$(DEFAULT_DIR))
-shared: fpc_shared $(addsuffix _shared,$(DEFAULT_DIR))
-install: fpc_install $(addsuffix _install,$(DEFAULT_DIR))
-sourceinstall: fpc_sourceinstall $(addsuffix _sourceinstall,$(DEFAULT_DIR))
-exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(DEFAULT_DIR))
-distinstall: fpc_distinstall $(addsuffix _distinstall,$(DEFAULT_DIR))
-zipinstall: fpc_zipinstall $(addsuffix _zipinstall,$(DEFAULT_DIR))
-zipsourceinstall: fpc_zipsourceinstall $(addsuffix _zipsourceinstall,$(DEFAULT_DIR))
-zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(DEFAULT_DIR))
-zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(DEFAULT_DIR))
-clean: fpc_clean $(addsuffix _clean,$(DEFAULT_DIR))
-distclean: fpc_distclean $(addsuffix _distclean,$(DEFAULT_DIR))
-cleanall: fpc_cleanall $(addsuffix _cleanall,$(DEFAULT_DIR))
-info: fpc_info $(addsuffix _info,$(DEFAULT_DIR))
+ifdef TARGET_DIRS_BEOS
+beos_all:
+	$(MAKE) -C beos all
+beos_debug:
+	$(MAKE) -C beos debug
+beos_examples:
+	$(MAKE) -C beos examples
+beos_smart:
+	$(MAKE) -C beos smart
+beos_shared:
+	$(MAKE) -C beos shared
+beos_install:
+	$(MAKE) -C beos install
+beos_sourceinstall:
+	$(MAKE) -C beos sourceinstall
+beos_exampleinstall:
+	$(MAKE) -C beos exampleinstall
+beos_distinstall:
+	$(MAKE) -C beos distinstall
+beos_zipinstall:
+	$(MAKE) -C beos zipinstall
+beos_zipsourceinstall:
+	$(MAKE) -C beos zipsourceinstall
+beos_zipexampleinstall:
+	$(MAKE) -C beos zipexampleinstall
+beos_zipdistinstall:
+	$(MAKE) -C beos zipdistinstall
+beos_clean:
+	$(MAKE) -C beos clean
+beos_distclean:
+	$(MAKE) -C beos distclean
+beos_cleanall:
+	$(MAKE) -C beos cleanall
+beos_info:
+	$(MAKE) -C beos info
+beos:
+	$(MAKE) -C beos all
+.PHONY: beos_all beos_debug beos_examples beos_smart beos_shared beos_install beos_sourceinstall beos_exampleinstall beos_distinstall beos_zipinstall beos_zipsourceinstall beos_zipexampleinstall beos_zipdistinstall beos_clean beos_distclean beos_cleanall beos_info beos
+endif
+all: fpc_all $(addsuffix _all,$(TARGET_DIRS))
+debug: fpc_debug $(addsuffix _debug,$(TARGET_DIRS))
+examples: fpc_examples $(addsuffix _examples,$(TARGET_DIRS))
+smart: fpc_smart $(addsuffix _smart,$(TARGET_DIRS))
+shared: fpc_shared $(addsuffix _shared,$(TARGET_DIRS))
+install: fpc_install $(addsuffix _install,$(TARGET_DIRS))
+sourceinstall: fpc_sourceinstall
+exampleinstall: fpc_exampleinstall $(addsuffix _exampleinstall,$(TARGET_DIRS))
+distinstall: fpc_distinstall
+zipinstall: fpc_zipinstall
+zipsourceinstall: fpc_zipsourceinstall
+zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
+zipdistinstall: fpc_zipdistinstall $(addsuffix _zipdistinstall,$(TARGET_DIRS))
+clean: fpc_clean $(addsuffix _clean,$(TARGET_DIRS))
+distclean: fpc_distclean $(addsuffix _distclean,$(TARGET_DIRS))
+cleanall: fpc_cleanall $(addsuffix _cleanall,$(TARGET_DIRS))
+info: fpc_info $(addsuffix _info,$(TARGET_DIRS))
 .PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 .PHONY: all debug examples smart shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info
 ifneq ($(wildcard fpcmake.loc),)
 ifneq ($(wildcard fpcmake.loc),)
 include fpcmake.loc
 include fpcmake.loc

+ 7 - 2
rtl/Makefile.fpc

@@ -7,11 +7,16 @@ name=rtl
 version=1.0.5
 version=1.0.5
 
 
 [target]
 [target]
-dirs=linux win32 go32v2 go32v1 os2 freebsd
+dirs_linux=linux
+dirs_win32=win32
+dirs_go32v2=go32v2
+dirs_go32v1=go32v1
+dirs_os2=os2
+dirs_freebsd=freebsd
+dirs_beos=beos
 
 
 [install]
 [install]
 fpcpackage=y
 fpcpackage=y
 
 
 [default]
 [default]
 fpcdir=..
 fpcdir=..
-dir=$(OS_TARGET)