[Lazarus] Conflict "Makefile.compiled" in some components packages

[Zaher Dirkey]

2011/2/7 Mattias Gaertner <nc-gaertnma at netcologne.de>

>
>
>
> Zaher Dirkey <parmaja at gmail.com> hat am 7. Februar 2011 um 16:04
> geschrieben:
>
>
>
>  2011/2/7 Mattias Gaertner <nc-gaertnma at netcologne.de>
>
>
>
>
>
> Zaher Dirkey <parmaja at gmail.com> hat am 7. Februar 2011 um 15:20
> geschrieben:
>
>
>  I use svn update then it give me the file Makefile.compiled is
> conflicted.
> I think Makefile.compiled have to be ignored file.
>
>
>  No. It is used. It was outdated. I updated it.
>   Mattias
>
>
> I revert this files, but when install components package this files changed
> after.
>
> i do itafter i made "svn update", "Make clean bigide" in command line ,
> then install component in IDE.
>
>  What Makefile.compiled files are changed?
>
> Maybe I forgot one.
>
>

The changed file

components/fpcunit/ide/Makefile.compiled
components/memds/Makefile.compiled
components/printers/design/Makefile.compiled
components/printers/Makefile.compiled
components/projecttemplates/Makefile.compiled
components/rtticontrols/Makefile.compiled
components/sdf/Makefile.compiled
components/sqldb/Makefile.compiled
components/tachart/Makefile.compiled
components/tdbf/Makefile.compiled
components/turbopower_ipro/Makefile.compiled

I am not modified the units of this packages.

-- 
Zaher Dirkey
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lazarus-ide.org/pipermail/lazarus/attachments/20110207/e74e3ebb/attachment-0003.html>