Browse Source

* fpcmake updates

peter 26 years ago
parent
commit
c35eba9070

+ 11 - 8
base/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:10
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: info
@@ -148,6 +148,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -187,9 +190,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -567,15 +570,15 @@ depend: $(addsuffix _depend,$(DIROBJECTS))
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 
 # Target Dirs

+ 8 - 5
fcl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:58
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -148,6 +148,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -195,15 +198,15 @@ info: $(OS_TARGET)_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 
 # Target Dirs

+ 17 - 12
fcl/db/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:00
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -159,6 +159,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -203,9 +206,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -673,22 +676,22 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
-ifneq ($(wildcard $(FCLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(FCLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(FCLDIR)),)
+ifeq ($(wildcard $(FCLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=fcl
 fcl_package:
-	$(MAKE) -C $(FCLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(FCLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package $(OS_TARGET)_package
+.PHONY:  rtl_package fcl_package
 
 #####################################################################
 # Units
@@ -728,7 +731,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
fcl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:59
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -171,6 +171,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -214,9 +217,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -669,15 +672,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -702,7 +705,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
fcl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:59
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -171,6 +171,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -214,9 +217,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -669,15 +672,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -702,7 +705,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
fcl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:00
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -171,6 +171,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -214,9 +217,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -669,15 +672,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -702,7 +705,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 17 - 12
fcl/shedit/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:59
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -157,6 +157,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -207,9 +210,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -657,18 +660,18 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
-ifneq ($(wildcard $(FCLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(FCLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(FCLDIR)),)
+ifeq ($(wildcard $(FCLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=fcl
 fcl_package:
-	$(MAKE) -C $(FCLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(FCLDIR) all
 endif
 endif
 
@@ -688,7 +691,7 @@ endif
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package $(OS_TARGET)_package gtk_package
+.PHONY:  rtl_package fcl_package gtk_package
 
 #####################################################################
 # Units
@@ -728,7 +731,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 17 - 12
fcl/tests/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:59
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -156,6 +156,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -199,9 +202,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -653,22 +656,22 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
-ifneq ($(wildcard $(FCLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(FCLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(FCLDIR)),)
+ifeq ($(wildcard $(FCLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=fcl
 fcl_package:
-	$(MAKE) -C $(FCLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(FCLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package $(OS_TARGET)_package
+.PHONY:  rtl_package fcl_package
 
 #####################################################################
 # Exes
@@ -694,7 +697,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
fcl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:58
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:49
 #
 
 defaultrule: all
@@ -171,6 +171,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -214,9 +217,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -669,15 +672,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -702,7 +705,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 8 - 5
ide/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:01
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -148,6 +148,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -193,15 +196,15 @@ info: $(addsuffix _info,$(DIROBJECTS))
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 
 # Target Dirs

+ 8 - 5
ide/fake/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:01
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -148,6 +148,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -195,15 +198,15 @@ info: $(addsuffix _info,$(DIROBJECTS))
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 
 # Target Dirs

+ 14 - 9
ide/fake/compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:01
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -148,6 +148,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -187,9 +190,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -620,15 +623,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -653,7 +656,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
ide/fake/gdb/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:01
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -148,6 +148,9 @@ ZIPTARGET=install
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -187,9 +190,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -620,15 +623,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -653,7 +656,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
ide/text/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:01
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -179,6 +179,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDUNITDIR=$(COMPUNITDIR) $(GDBUNITDIR)
 override NEEDLIBDIR=$(GDBLIBDIR)
 override NEEDOBJDIR=$(GDBOBJDIR)
@@ -224,9 +227,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -685,11 +688,11 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
@@ -724,7 +727,7 @@ endif
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package api_package fv_package gdbint_package
+.PHONY:  rtl_package api_package fv_package gdbint_package
 
 #####################################################################
 # Exes
@@ -750,7 +753,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/forms/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -160,6 +160,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -199,9 +202,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -640,15 +643,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -688,7 +691,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/gdbint/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:46
 #
 
 defaultrule: all
@@ -153,6 +153,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDLIBDIR=libgdb/$(OS_TARGET)
 override NEEDOBJDIR=libgdb/$(OS_TARGET)
 ifndef TARGETDIR
@@ -198,9 +201,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -666,15 +669,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -729,7 +732,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/ggi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:46
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/gtk/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 ifndef TARGETDIR
 TARGETDIR=.
 endif
@@ -195,9 +198,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -639,15 +642,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -672,7 +675,9 @@ fpc_units: $(UNITPPUFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/gtk/examples/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDUNITDIR=..
 ifndef TARGETDIR
 TARGETDIR=.
@@ -197,9 +200,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -671,15 +674,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Exes
@@ -705,7 +708,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/gtk/tutorial/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -151,6 +151,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDUNITDIR=..
 ifndef TARGETDIR
 TARGETDIR=.
@@ -196,9 +199,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -670,15 +673,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Exes
@@ -704,7 +707,9 @@ fpc_exes: $(EXEFILES)
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/ibase/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/inet/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/mysql/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/ncurses/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:46
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/opengl/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:46
 #
 
 defaultrule: all
@@ -153,6 +153,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -192,9 +195,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -641,15 +644,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -689,7 +692,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/paszlib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -153,6 +153,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -192,9 +195,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -641,15 +644,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -689,7 +692,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/postgres/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:05
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/svgalib/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:06
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/uncgi/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:06
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 14 - 9
packages/utmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:06
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
 #
 
 defaultrule: all
@@ -152,6 +152,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 
 # Packages
 
@@ -191,9 +194,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -636,15 +639,15 @@ info: fpc_info
 # Package depends
 #####################################################################
 
-ifneq ($(wildcard $(RTLDIR)/$(OS_TARGET)),)
-ifeq ($(wildcard $(RTLDIR)/$(OS_TARGET)/$(FPCMAKED)),)
+ifneq ($(wildcard $(RTLDIR)),)
+ifeq ($(wildcard $(RTLDIR)/$(FPCMAKED)),)
 override COMPILEPACKAGES+=rtl
 rtl_package:
-	$(MAKE) -C $(RTLDIR)/$(OS_TARGET) all
+	$(MAKE) -C $(RTLDIR) all
 endif
 endif
 
-.PHONY:  $(OS_TARGET)_package
+.PHONY:  rtl_package
 
 #####################################################################
 # Units
@@ -684,7 +687,9 @@ fpc_test: examples
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 24 - 19
rtl/go32v1/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:57
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:51
 #
 
 defaultrule: all
@@ -174,6 +174,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC) $(PROCINC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -236,9 +239,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -688,20 +691,6 @@ info: fpc_info
 #####################################################################
 
 
-#####################################################################
-# Units
-#####################################################################
-
-.PHONY: fpc_units
-
-override ALLTARGET+=fpc_units
-
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
-override INSTALLPPUFILES+=$(UNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES)
-
-fpc_units: $(UNITPPUFILES)
-
 #####################################################################
 # Loaders
 #####################################################################
@@ -730,6 +719,20 @@ fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
 	$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
 
+#####################################################################
+# Units
+#####################################################################
+
+.PHONY: fpc_units
+
+override ALLTARGET+=fpc_units
+
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
+override INSTALLPPUFILES+=$(UNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES)
+
+fpc_units: $(UNITPPUFILES)
+
 #####################################################################
 # General compile rules
 #####################################################################
@@ -739,7 +742,9 @@ fpc_loaders_install:
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 24 - 19
rtl/go32v2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:56
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:51
 #
 
 defaultrule: all
@@ -174,6 +174,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC) $(PROCINC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -236,9 +239,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -688,20 +691,6 @@ info: fpc_info
 #####################################################################
 
 
-#####################################################################
-# Units
-#####################################################################
-
-.PHONY: fpc_units
-
-override ALLTARGET+=fpc_units
-
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
-override INSTALLPPUFILES+=$(UNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES)
-
-fpc_units: $(UNITPPUFILES)
-
 #####################################################################
 # Loaders
 #####################################################################
@@ -730,6 +719,20 @@ fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
 	$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
 
+#####################################################################
+# Units
+#####################################################################
+
+.PHONY: fpc_units
+
+override ALLTARGET+=fpc_units
+
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
+override INSTALLPPUFILES+=$(UNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES)
+
+fpc_units: $(UNITPPUFILES)
+
 #####################################################################
 # General compile rules
 #####################################################################
@@ -739,7 +742,9 @@ fpc_loaders_install:
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 24 - 19
rtl/linux/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:56
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:51
 #
 
 defaultrule: all
@@ -183,6 +183,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC) $(PROCINC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -247,9 +250,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -699,20 +702,6 @@ info: fpc_info
 #####################################################################
 
 
-#####################################################################
-# Units
-#####################################################################
-
-.PHONY: fpc_units
-
-override ALLTARGET+=fpc_units
-
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
-override INSTALLPPUFILES+=$(UNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES)
-
-fpc_units: $(UNITPPUFILES)
-
 #####################################################################
 # Loaders
 #####################################################################
@@ -741,6 +730,20 @@ fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
 	$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
 
+#####################################################################
+# Units
+#####################################################################
+
+.PHONY: fpc_units
+
+override ALLTARGET+=fpc_units
+
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
+override INSTALLPPUFILES+=$(UNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES)
+
+fpc_units: $(UNITPPUFILES)
+
 #####################################################################
 # General compile rules
 #####################################################################
@@ -750,7 +753,9 @@ fpc_loaders_install:
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 24 - 19
rtl/os2/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:57
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:51
 #
 
 defaultrule: all
@@ -174,6 +174,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC) $(PROCINC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -236,9 +239,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -688,20 +691,6 @@ info: fpc_info
 #####################################################################
 
 
-#####################################################################
-# Units
-#####################################################################
-
-.PHONY: fpc_units
-
-override ALLTARGET+=fpc_units
-
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
-override INSTALLPPUFILES+=$(UNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES)
-
-fpc_units: $(UNITPPUFILES)
-
 #####################################################################
 # Loaders
 #####################################################################
@@ -730,6 +719,20 @@ fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
 	$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
 
+#####################################################################
+# Units
+#####################################################################
+
+.PHONY: fpc_units
+
+override ALLTARGET+=fpc_units
+
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
+override INSTALLPPUFILES+=$(UNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES)
+
+fpc_units: $(UNITPPUFILES)
+
 #####################################################################
 # General compile rules
 #####################################################################
@@ -739,7 +742,9 @@ fpc_loaders_install:
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1

+ 24 - 19
rtl/win32/Makefile

@@ -1,5 +1,5 @@
 #
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 19:57
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:51
 #
 
 defaultrule: all
@@ -179,6 +179,9 @@ endif
 ifndef PACKAGEDIR
 PACKAGEDIR=$(FPCDIR)/packages
 endif
+ifndef COMPONENTDIR
+COMPONENTDIR=$(FPCDIR)/components
+endif
 override NEEDINCDIR=$(INC) $(PROCINC)
 ifndef TARGETDIR
 TARGETDIR=.
@@ -241,9 +244,9 @@ endif
 # create fcldir,rtldir,unitdir
 ifdef FPCDIR
 ifneq ($(FPCDIR),.)
-override RTLDIR=$(FPCDIR)/rtl
-override FCLDIR=$(FPCDIR)/fcl
-override UNITDIR=$(FPCDIR)/units
+override RTLDIR=$(FPCDIR)/rtl/$(OS_TARGET)
+override FCLDIR=$(FPCDIR)/fcl/$(OS_TARGET)
+override UNITSDIR=$(FPCDIR)/units/$(OS_TARGET)
 endif
 endif
 
@@ -693,20 +696,6 @@ info: fpc_info
 #####################################################################
 
 
-#####################################################################
-# Units
-#####################################################################
-
-.PHONY: fpc_units
-
-override ALLTARGET+=fpc_units
-
-override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
-override INSTALLPPUFILES+=$(UNITPPUFILES)
-override CLEANPPUFILES+=$(UNITPPUFILES)
-
-fpc_units: $(UNITPPUFILES)
-
 #####################################################################
 # Loaders
 #####################################################################
@@ -735,6 +724,20 @@ fpc_loaders_install:
 	$(MKDIR) $(UNITINSTALLDIR)
 	$(INSTALL) $(LOADEROFILES) $(UNITINSTALLDIR)
 
+#####################################################################
+# Units
+#####################################################################
+
+.PHONY: fpc_units
+
+override ALLTARGET+=fpc_units
+
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(UNITOBJECTS))
+override INSTALLPPUFILES+=$(UNITPPUFILES)
+override CLEANPPUFILES+=$(UNITPPUFILES)
+
+fpc_units: $(UNITPPUFILES)
+
 #####################################################################
 # General compile rules
 #####################################################################
@@ -744,7 +747,9 @@ fpc_loaders_install:
 $(FPCMAKED):
 	@$(ECHO) Compiled > $(FPCMAKED)
 
-fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) $(ALLTARGET) $(FPCMAKED)
+fpc_all: $(addsuffix _package,$(COMPILEPACKAGES)) \
+	 $(addsuffix _component,$(COMPILECOMPONENTS)) \
+	 $(ALLTARGET) $(FPCMAKED)
 
 fpc_debug:
 	$(MAKE) all DEBUG=1