|
|
@@ -1,5 +1,5 @@
|
|
|
#
|
|
|
-# Makefile generated by fpcmake v0.99.13 on 1999-11-25 20:08
|
|
|
+# Makefile generated by fpcmake v0.99.13 on 1999-11-25 23:47
|
|
|
#
|
|
|
|
|
|
defaultrule: all
|
|
|
@@ -214,6 +214,9 @@ endif
|
|
|
ifndef PACKAGEDIR
|
|
|
PACKAGEDIR=$(FPCDIR)/packages
|
|
|
endif
|
|
|
+ifndef COMPONENTDIR
|
|
|
+COMPONENTDIR=$(FPCDIR)/components
|
|
|
+endif
|
|
|
override NEEDUNITDIR=$(CPU_TARGET) . $(OLDDIR)
|
|
|
override NEEDINCDIR=$(OLDDIR)
|
|
|
ifndef TARGETDIR
|
|
|
@@ -280,9 +283,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
|
|
|
|
|
|
@@ -753,15 +756,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
|
|
|
|
|
|
#####################################################################
|
|
|
# General compile rules
|
|
|
@@ -772,7 +775,9 @@ endif
|
|
|
$(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
|
peter