paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-11 11:29:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fix removing units/$fpctarget dir while cleaning. Probably manual

Browse Source 
intervention is needed because deeper level dirs create this unitdir.

git-svn-id: trunk@15028 -
This commit is contained in:
marco 2010-03-21 12:41:42 +00:00
parent fa1d72a2cc
commit 3c26eb8186
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/fcl-db/Makefile
View File

@ -1,8 +1,8 @@
#
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2009/12/10]
# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/03/21]
#
default: all
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded avr-embedded armeb-linux armeb-embedded mipsel-linux
BSDs = freebsd netbsd openbsd darwin
UNIXs = linux $(BSDs) solaris qnx haiku
LIMIT83fs = go32v2 os2 emx watcom
@ -326,6 +326,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_DIRS+=src/sdf src/memds src/sqldb src/base src/dbase src/sqlite src/paradox src/export src/datadict src/codegen
endif
@ -507,6 +510,9 @@ endif
ifeq ($(FULL_TARGET),i386-symbian)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),i386-nativent)
override COMPILER_OPTIONS+=-S2h
endif
ifeq ($(FULL_TARGET),m68k-linux)
override COMPILER_OPTIONS+=-S2h
endif
@ -1000,6 +1006,10 @@ ifeq ($(OS_TARGET),symbian)
SHAREDLIBEXT=.dll
SHORTSUFFIX=symbian
endif
ifeq ($(OS_TARGET),NativeNT)
SHAREDLIBEXT=.dll
SHORTSUFFIX=nativent
endif
else
ifeq ($(OS_TARGET),go32v1)
PPUEXT=.pp1
@ -1568,6 +1578,10 @@ ifeq ($(FULL_TARGET),i386-symbian)
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_FCL-XML=1
endif
ifeq ($(FULL_TARGET),i386-nativent)
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_FCL-XML=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
REQUIRE_PACKAGES_FCL-BASE=1
REQUIRE_PACKAGES_ICONVENC=1
@ -2489,6 +2503,9 @@ fpc_zipdistinstall:
ifdef EXEFILES
override CLEANEXEFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEFILES))
endif
ifdef CLEAN_PROGRAMS
override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS)))
endif
ifdef CLEAN_UNITS
override CLEANPPUFILES+=$(addsuffix $(PPUEXT),$(CLEAN_UNITS))
endif
@ -2535,6 +2552,9 @@ endif
ifdef CLEANRSTFILES
-$(DEL) $(addprefix $(UNITTARGETDIRPREFIX),$(CLEANRSTFILES))
endif
endif
ifdef CLEAN_FILES
-$(DEL) $(CLEAN_FILES)
endif
-$(DELTREE) units
-$(DEL) *$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT)
@ -2823,6 +2843,12 @@ TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1
endif
ifeq ($(FULL_TARGET),i386-nativent)
TARGET_DIRS_SRC/SDF=1
TARGET_DIRS_SRC/MEMDS=1
TARGET_DIRS_SRC/SQLDB=1
TARGET_DIRS_SRC/BASE=1
endif
ifeq ($(FULL_TARGET),m68k-linux)
TARGET_DIRS_SRC/SDF=1
TARGET_DIRS_SRC/MEMDS=1
@ -3621,15 +3647,15 @@ zipinstall: fpc_zipinstall
zipsourceinstall: fpc_zipsourceinstall
zipexampleinstall: fpc_zipexampleinstall $(addsuffix _zipexampleinstall,$(TARGET_DIRS))
zipdistinstall: fpc_zipdistinstall
clean: $(addsuffix _clean,$(TARGET_DIRS))
distclean: $(addsuffix _distclean,$(TARGET_DIRS))
cleanall: $(addsuffix _cleanall,$(TARGET_DIRS))
info: fpc_info
makefiles: fpc_makefiles
.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall clean distclean cleanall info makefiles
.PHONY: all debug smart release units examples shared install sourceinstall exampleinstall distinstall zipinstall zipsourceinstall zipexampleinstall zipdistinstall info makefiles
ifneq ($(wildcard fpcmake.loc),)
include fpcmake.loc
endif
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean
cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall
.NOTPARALLEL:
src/export_all: src/base_all src/dbase_all
src/export_debug: src/base_debug src/dbase_debug

5
packages/fcl-db/Makefile.fpc
View File

@ -32,8 +32,11 @@ fpcpackage=y
[default]
fpcdir=../..
[rules]
distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
clean: $(addsuffix _clean,$(TARGET_DIRS)) fpc_clean
cleanall: $(addsuffix _cleanall,$(TARGET_DIRS)) fpc_cleanall
.NOTPARALLEL:
src/export_all: src/base_all src/dbase_all