|
|
@@ -221,7 +221,7 @@ endif
|
|
|
PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/extra)
|
|
|
override PACKAGE_NAME=fcl
|
|
|
PACKAGEDIR_MAIN:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /fcl/Makefile.fpc,$(PACKAGESDIR))))))
|
|
|
-override TARGET_EXAMPLES+=asserttest frameworktest suitetest
|
|
|
+override TARGET_UNITS+=asserttest frameworktest suitetest
|
|
|
override INSTALL_FPCPACKAGE=y
|
|
|
override COMPILER_OPTIONS+=-S2h
|
|
|
override COMPILER_TARGETDIR+=../../$(OS_TARGET)
|
|
|
@@ -1284,28 +1284,19 @@ ifeq ($(FULL_SOURCE),$(FULL_TARGET))
|
|
|
EXECPPAS:=@$(PPAS)
|
|
|
endif
|
|
|
endif
|
|
|
+.PHONY: fpc_units
|
|
|
+ifneq ($(TARGET_UNITS),)
|
|
|
+override ALLTARGET+=fpc_units
|
|
|
+override UNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_UNITS))
|
|
|
+override IMPLICITUNITPPUFILES=$(addsuffix $(PPUEXT),$(TARGET_IMPLICITUNITS))
|
|
|
+override INSTALLPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
|
|
|
+override CLEANPPUFILES+=$(UNITPPUFILES) $(IMPLICITUNITPPUFILES)
|
|
|
+endif
|
|
|
+fpc_units: $(COMPILER_UNITTARGETDIR) $(UNITPPUFILES)
|
|
|
ifdef TARGET_RSTS
|
|
|
override RSTFILES=$(addsuffix $(RSTEXT),$(TARGET_RSTS))
|
|
|
override CLEANRSTFILES+=$(RSTFILES)
|
|
|
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 EXAMPLEFILES:=$(addsuffix $(EXEEXT),$(TARGET_EXAMPLES))
|
|
|
-override EXAMPLEOFILES:=$(addsuffix $(OEXT),$(TARGET_EXAMPLES)) $(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_EXAMPLES)))
|
|
|
-override CLEANEXEFILES+=$(EXAMPLEFILES) $(EXAMPLEOFILES)
|
|
|
-ifeq ($(OS_TARGET),os2)
|
|
|
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
|
|
|
-endif
|
|
|
-ifeq ($(OS_TARGET),emx)
|
|
|
-override CLEANEXEFILES+=$(addsuffix $(AOUTEXT),$(TARGET_EXAMPLES))
|
|
|
-endif
|
|
|
-endif
|
|
|
-ifneq ($(TARGET_EXAMPLEDIRS),)
|
|
|
-HASEXAMPLES=1
|
|
|
-endif
|
|
|
-fpc_examples: all $(EXAMPLEFILES) $(addsuffix _all,$(TARGET_EXAMPLEDIRS))
|
|
|
.PHONY: fpc_all fpc_smart fpc_debug fpc_release
|
|
|
$(FPCMADE): $(ALLDEPENDENCIES) $(ALLTARGET)
|
|
|
@$(ECHOREDIR) Compiled > $(FPCMADE)
|
|
|
@@ -1586,7 +1577,7 @@ debug: fpc_debug
|
|
|
smart: fpc_smart
|
|
|
release: fpc_release
|
|
|
units: fpc_units
|
|
|
-examples: fpc_examples
|
|
|
+examples:
|
|
|
shared:
|
|
|
install: fpc_install
|
|
|
sourceinstall: fpc_sourceinstall
|
michael