From 61364ceacb225362a1e5efdfbe012982e53c97d9 Mon Sep 17 00:00:00 2001 From: lazarus Date: Mon, 20 May 2002 07:25:26 +0000 Subject: [PATCH] MG: removed interfaces.ppu from lcl Makefile git-svn-id: trunk@1700 - --- lcl/Makefile | 14 ++++++++++---- lcl/Makefile.fpc | 4 +++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lcl/Makefile b/lcl/Makefile index 84a1d9f8bb..709cecdf2a 100644 --- a/lcl/Makefile +++ b/lcl/Makefile @@ -1,5 +1,5 @@ # -# Don't edit, this file is generated by FPCMake Version 1.1 [2002/04/22] +# Don't edit, this file is generated by FPCMake Version 1.1 [2002/05/20] # default: all MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware @@ -239,7 +239,7 @@ override REQUIRE_PACKAGESDIR+=$(LCLCOMPONENTDIR) override COMPILER_UNITDIR+=$(LCLUNITDIR) override TARGET_DIRS+=interfaces override TARGET_UNITS+=allunits -override TARGET_IMPLICITUNITS+=arrow buttons calendar clipbrd clistbox comctrls controls dialogs dynhasharray extctrls filectrl forms graphics imglist interfacebase lazqueue lcllinux lmessages lresources menus messages registry spin stdctrls toolwin utrace vclglobals interfaces +override TARGET_IMPLICITUNITS+=arrow buttons calendar clipbrd clistbox comctrls controls dialogs dynhasharray extctrls filectrl forms graphics imglist interfacebase lazqueue lcllinux lmessages lresources menus messages registry spin stdctrls toolwin utrace vclglobals override TARGET_RSTS+=dialogs override CLEAN_FILES+=$(wildcard units/*$(OEXT)) $(wildcard units/*$(PPUEXT)) $(wildcard units/*$(RSTEXT))$(wildcard *$(OEXT)) $(wildcard *$(PPUEXT)) $(wildcard *$(RSTEXT)) override INSTALL_BUILDUNIT=allunits @@ -266,6 +266,9 @@ endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),qnx) +UNIXINSTALLDIR=1 +endif else ifeq ($(OS_SOURCE),linux) UNIXINSTALLDIR=1 @@ -279,6 +282,9 @@ endif ifeq ($(OS_TARGET),sunos) UNIXINSTALLDIR=1 endif +ifeq ($(OS_TARGET),qnx) +UNIXINSTALLDIR=1 +endif endif ifndef INSTALL_PREFIX ifdef PREFIX @@ -513,7 +519,7 @@ ECHO=echo endif ifeq ($(OS_TARGET),amiga) EXEEXT= -PPUEXT=.ppa +PPUEXT=.ppu ASMEXT=.asm OEXT=.o SMARTEXT=.sl @@ -522,7 +528,7 @@ SHAREDLIBEXT=.library FPCMADE=fpcmade.amg endif ifeq ($(OS_TARGET),atari) -PPUEXT=.ppt +PPUEXT=.ppu ASMEXT=.s OEXT=.o SMARTEXT=.sl diff --git a/lcl/Makefile.fpc b/lcl/Makefile.fpc index 1154aef120..d1955a3553 100644 --- a/lcl/Makefile.fpc +++ b/lcl/Makefile.fpc @@ -14,7 +14,9 @@ implicitunits=arrow buttons calendar clipbrd clistbox comctrls controls \ dialogs dynhasharray extctrls filectrl forms graphics \ imglist interfacebase lazqueue lcllinux lmessages lresources \ menus messages registry spin stdctrls toolwin utrace \ - vclglobals interfaces + vclglobals +# !!! do not add interfaces. interfaces.ppu belongs to the interface(s). + rsts=dialogs [require]