* Some makefile changes not propagated to devel?

This commit is contained in:
marco 2000-11-14 12:07:21 +00:00
parent 063e1d6e42
commit 633874fe40
4 changed files with 71 additions and 6 deletions

View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v1.00 [2000/10/27]
# Makefile generated by fpcmake v1.00 [2000/11/08]
#
defaultrule: all
@ -103,7 +103,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV)
endif
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
#####################################################################
# FPCDIR Setting
@ -151,7 +151,7 @@ endif
# Targets
override DIROBJECTS+=$(wildcard go32v2 linux win32 os2)
override DIROBJECTS+=$(wildcard go32v2 linux win32 os2 freebsd)
override EXAMPLEDIROBJECTS+=test
# Clean
@ -618,6 +618,7 @@ OBJECTDIRGO32V2=1
OBJECTDIRLINUX=1
OBJECTDIRWIN32=1
OBJECTDIROS2=1
OBJECTDIRFREEBSD=1
# Dir go32v2
@ -858,6 +859,66 @@ os2_require:
os2_info:
$(MAKE) -C os2 info
endif
# Dir freebsd
ifdef OBJECTDIRFREEBSD
.PHONY: freebsd_all freebsd_debug freebsd_examples freebsd_test freebsd_smart freebsd_shared freebsd_showinstall freebsd_install freebsd_sourceinstall freebsd_exampleinstall freebsd_zipinstall freebsd_zipsourceinstall freebsd_zipexampleinstall freebsd_clean freebsd_distclean freebsd_cleanall freebsd_require freebsd_info
freebsd_all:
$(MAKE) -C freebsd all
freebsd_debug:
$(MAKE) -C freebsd debug
freebsd_examples:
$(MAKE) -C freebsd examples
freebsd_test:
$(MAKE) -C freebsd test
freebsd_smart:
$(MAKE) -C freebsd smart
freebsd_shared:
$(MAKE) -C freebsd shared
freebsd_showinstall:
$(MAKE) -C freebsd showinstall
freebsd_install:
$(MAKE) -C freebsd install
freebsd_sourceinstall:
$(MAKE) -C freebsd sourceinstall
freebsd_exampleinstall:
$(MAKE) -C freebsd exampleinstall
freebsd_zipinstall:
$(MAKE) -C freebsd zipinstall
freebsd_zipsourceinstall:
$(MAKE) -C freebsd zipsourceinstall
freebsd_zipexampleinstall:
$(MAKE) -C freebsd zipexampleinstall
freebsd_clean:
$(MAKE) -C freebsd clean
freebsd_distclean:
$(MAKE) -C freebsd distclean
freebsd_cleanall:
$(MAKE) -C freebsd cleanall
freebsd_require:
$(MAKE) -C freebsd require
freebsd_info:
$(MAKE) -C freebsd info
endif
EXAMPLEDIRTEST=1
# Dir test

View File

@ -3,7 +3,7 @@
#
[targets]
dirs=go32v2 linux win32 os2
dirs=go32v2 linux win32 os2 freebsd
exampledirs=test
[defaults]

View File

@ -1,5 +1,5 @@
#
# Makefile generated by fpcmake v1.00 [2000/10/27]
# Makefile generated by fpcmake v1.00 [2000/11/08]
#
defaultrule: all
@ -109,7 +109,7 @@ ifndef FPC_VERSION
FPC_VERSION:=$(shell $(FPC) -iV)
endif
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION
export FPC OS_TARGET OS_SOURCE CPU_TARGET CPU_SOURCE FPC_VERSION FPCOPT
#####################################################################
# Pre Settings
@ -1266,6 +1266,8 @@ endif
#####################################################################
terminfo$(PPUEXT): $(UNIXINC)/terminfo.pas
video$(PPUEXT): $(INC)/video.pas $(UNIXINC)/video.inc
keyboard$(PPUEXT): $(INC)/keyboard.pas $(UNIXINC)/keyboard.inc

View File

@ -34,6 +34,8 @@ include $(INC)/Makefile.api
[rules]
terminfo$(PPUEXT): $(UNIXINC)/terminfo.pas
video$(PPUEXT): $(INC)/video.pas $(UNIXINC)/video.inc
keyboard$(PPUEXT): $(INC)/keyboard.pas $(UNIXINC)/keyboard.inc