[Xenomai-help] application make file

[Xenomai-help] application make file

[Everett Wang]

Hi All,

Now my application based user space xenomai has a few files and I want
to construct a Makefile to compile them. I looked at the
Makefiles in examples folder. It is not straight forward to modify one
for myself. I have c files and header files.  It is possible to get
a makefile with minor changes so it can automatically find the
dependence of c and h files?

Thanks.

Everett

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Everett Wang wrote:
> Hi All,
> 
> Now my application based user space xenomai has a few files and I want
> to construct a Makefile to compile them. I looked at the
> Makefiles in examples folder. It is not straight forward to modify one
> for myself. I have c files and header files.  It is possible to get
> a makefile with minor changes so it can automatically find the
> dependence of c and h files?

You can do this quite easily with GNU make. However, you are probably
better off using the autotools.

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Gilles Chanteperdrix wrote:
> Everett Wang wrote:
>> Hi All,
>>
>> Now my application based user space xenomai has a few files and I want
>> to construct a Makefile to compile them. I looked at the
>> Makefiles in examples folder. It is not straight forward to modify one
>> for myself. I have c files and header files.  It is possible to get
>> a makefile with minor changes so it can automatically find the
>> dependence of c and h files?
> 
> You can do this quite easily with GNU make.

Namely:
http://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html#Automatic-Prerequisites

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Everett Wang]

On Thu, Jun 17, 2010 at 7:16 PM, Gilles Chanteperdrix
<gilles.chanteperdrix@xenomai.org> wrote:
> Gilles Chanteperdrix wrote:
>> Everett Wang wrote:
>>> Hi All,
>>>
>>> Now my application based user space xenomai has a few files and I want
>>> to construct a Makefile to compile them. I looked at the
>>> Makefiles in examples folder. It is not straight forward to modify one
>>> for myself. I have c files and header files.  It is possible to get
>>> a makefile with minor changes so it can automatically find the
>>> dependence of c and h files?
>>
>> You can do this quite easily with GNU make.
>
> Namely:
> http://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html#Automatic-Prerequisites
>
> --
>                                            Gilles.
>

Thanks Gilles,

I can construct a Makefile for a non realtime application
with multiple files. What I don't know are the extra flags
for compiling and linking that xenomai requires. My
thinking is that after I have a normal (non xenomai) Makefile,
I can just add the compile flags when I compile each of the files
and add linking flags to produce a real time final program.

Everett

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Everett Wang wrote:
> On Thu, Jun 17, 2010 at 7:16 PM, Gilles Chanteperdrix
> <gilles.chanteperdrix@xenomai.org> wrote:
>> Gilles Chanteperdrix wrote:
>>> Everett Wang wrote:
>>>> Hi All,
>>>>
>>>> Now my application based user space xenomai has a few files and I want
>>>> to construct a Makefile to compile them. I looked at the
>>>> Makefiles in examples folder. It is not straight forward to modify one
>>>> for myself. I have c files and header files.  It is possible to get
>>>> a makefile with minor changes so it can automatically find the
>>>> dependence of c and h files?
>>> You can do this quite easily with GNU make.
>> Namely:
>> http://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html#Automatic-Prerequisites
>>
>> --
>>                                            Gilles.
>>
> 
> Thanks Gilles,
> 
> I can construct a Makefile for a non realtime application
> with multiple files. What I don't know are the extra flags
> for compiling and linking that xenomai requires. My
> thinking is that after I have a normal (non xenomai) Makefile,
> I can just add the compile flags when I compile each of the files
> and add linking flags to produce a real time final program.

If the hacker approach, that is, reading the Makefiles and see how they
obtain the flags is too complex for you, then use the mere human
approach: read the documentation.

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Everett Wang]

On Fri, Jun 18, 2010 at 7:40 PM, Bruno Rouchouse <brouchouse@domain.hid> wrote:
> Hi,
> if you haven't found it yet and if I understood correctly your question,
> xeno-config is probably what you need here ;)
> "xeno-config
> is a script that is used to to display the compiler and linker flags that are required for building applications that use Xenomai."
> Regards,
> --Bruno
> Le 17 juin 2010 à 17:39, Everett Wang a écrit :
>
> On Thu, Jun 17, 2010 at 7:16 PM, Gilles Chanteperdrix
> <gilles.chanteperdrix@xenomai.org> wrote:
>
> Gilles Chanteperdrix wrote:
>
> Everett Wang wrote:
>
> Hi All,
>
> Now my application based user space xenomai has a few files and I want
>
> to construct a Makefile to compile them. I looked at the
>
> Makefiles in examples folder. It is not straight forward to modify one
>
> for myself. I have c files and header files.  It is possible to get
>
> a makefile with minor changes so it can automatically find the
>
> dependence of c and h files?
>
> You can do this quite easily with GNU make.
>
> Namely:
>
> http://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html#Automatic-Prerequisites
>
> --
>
>                                            Gilles.
>
>
> Thanks Gilles,
>
> I can construct a Makefile for a non realtime application
> with multiple files. What I don't know are the extra flags
> for compiling and linking that xenomai requires. My
> thinking is that after I have a normal (non xenomai) Makefile,
> I can just add the compile flags when I compile each of the files
> and add linking flags to produce a real time final program.
>
> Everett
>
> _______________________________________________
> Xenomai-help mailing list
> Xenomai-help@domain.hid
> https://mail.gna.org/listinfo/xenomai-help
>
>

Thanks for the help. I touched cross-link.c then a "make -n" to find out the
xenomai flags.  I added these flags to my normal make file. It compiles
and runs fine now.

compiler flags:
CFLAGS_XENO = -I/usr/xenomai/include -D_GNU_SOURCE -D_REENTRANT -Wall
-pipe -D__XENO__

linker flags:
LDFLAGS_XENO = -L/usr/xenomai/lib -lxenomai -lpthread  -lnative -lrtdm
-Xlinker -rpath -Xlinker /usr/xenomai/lib

Hopefully it can be useful for new xenomai users.

Best regards,

Everett

Re: [Xenomai-help] application make file

[Wolfgang Grandegger]

On 06/19/2010 09:34 AM, Everett Wang wrote:
> On Fri, Jun 18, 2010 at 7:40 PM, Bruno Rouchouse <brouchouse@domain.hid> wrote:
>> Hi,
>> if you haven't found it yet and if I understood correctly your question,
>> xeno-config is probably what you need here ;)
>> "xeno-config
>> is a script that is used to to display the compiler and linker flags that are required for building applications that use Xenomai."
>> Regards,
>> --Bruno
>> Le 17 juin 2010 à 17:39, Everett Wang a écrit :
>>
>> On Thu, Jun 17, 2010 at 7:16 PM, Gilles Chanteperdrix
>> <gilles.chanteperdrix@xenomai.org> wrote:
>>
>> Gilles Chanteperdrix wrote:
>>
>> Everett Wang wrote:
>>
>> Hi All,
>>
>> Now my application based user space xenomai has a few files and I want
>>
>> to construct a Makefile to compile them. I looked at the
>>
>> Makefiles in examples folder. It is not straight forward to modify one
>>
>> for myself. I have c files and header files.  It is possible to get
>>
>> a makefile with minor changes so it can automatically find the
>>
>> dependence of c and h files?
>>
>> You can do this quite easily with GNU make.
>>
>> Namely:
>>
>> http://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html#Automatic-Prerequisites
>>
>> --
>>
>>                                            Gilles.
>>
>>
>> Thanks Gilles,
>>
>> I can construct a Makefile for a non realtime application
>> with multiple files. What I don't know are the extra flags
>> for compiling and linking that xenomai requires. My
>> thinking is that after I have a normal (non xenomai) Makefile,
>> I can just add the compile flags when I compile each of the files
>> and add linking flags to produce a real time final program.
>>
>> Everett
>>
>> _______________________________________________
>> Xenomai-help mailing list
>> Xenomai-help@domain.hid
>> https://mail.gna.org/listinfo/xenomai-help
>>
>>
> 
> Thanks for the help. I touched cross-link.c then a "make -n" to find out the
> xenomai flags.  I added these flags to my normal make file. It compiles
> and runs fine now.
> 
> compiler flags:
> CFLAGS_XENO = -I/usr/xenomai/include -D_GNU_SOURCE -D_REENTRANT -Wall
> -pipe -D__XENO__
> 
> linker flags:
> LDFLAGS_XENO = -L/usr/xenomai/lib -lxenomai -lpthread  -lnative -lrtdm
> -Xlinker -rpath -Xlinker /usr/xenomai/lib
> 
> Hopefully it can be useful for new xenomai users.

You should use *xeno-config* in your Makefile to get the proper compiler
and linker flags.

Wolfgang,

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Everett Wang wrote:
> Hopefully it can be useful for new xenomai users.

I do not know if it is me who changed, or if the average xenoma user
changed. But it seems to me that we see more and more users on this list
who do not bother to read the documentation.

Giving them the information which they can find in the documentation if
in fact a bad way of helping them: they then can continue to avoid
reading the documentation.

I believe there is a proverb which says: "Give a man a fish; you have
fed him for today.  Teach a man to fish; and you have fed him for a
lifetime".

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Bruno Rouchouse wrote:
> Hi Gilles,
> 
> I do understand your point an mostly agrees with it. What you say is  
> really common sense.
> 
> However, I would object 2 points: first it's everyone's freedom to  
> help someone or not even if it is a dummy question. In fact, due to my  
> knowledge, I can help only on those ;)

> 
> Second, it's not so easy when you start using a technology to find all  
> the right pointers and have all the answers. For instance, I'm still  
> struggling with lot's of git features and workflow although everything  
> is documented. Reading all man pages does not really help me for every  
> use case.

> 
> Finally, I answered privately without putting the list in cc  
> especially to avoid bothering advanced users. I don't really see  
> anything wrong with that.

Well, the problem with private answers is that other people on the list
do not know that you have answered.

I really have no problem with other people than me answering the
questions, and in fact, I would even be glad if it happened more often.
And in that case, of course, it would be nice to answer on the list, so
that I know that the question is answered and I do not have to answer it.

As for the issue itself, it helps some people to bootstrap them by
answering their first questions directly. But look at Everett posts, we
have helped him in each and every step of his work, and he still
continues to post questions instead of looking for answers himself. We
simply have to stop at some points, or we will do his work in his stead.

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Piquesel]

Hi, 

oops, something went wrong with my previous answer sent from my cell phone. I post again then. See inline.

Le 19 juin 2010 à 12:45, Gilles Chanteperdrix a écrit :

> Bruno Rouchouse wrote:
>> Hi Gilles,
>> 
>> I do understand your point an mostly agrees with it. What you say is  
>> really common sense.
>> 
>> However, I would object 2 points: first it's everyone's freedom to  
>> help someone or not even if it is a dummy question. In fact, due to my  
>> knowledge, I can help only on those ;)
> 
>> 
>> Second, it's not so easy when you start using a technology to find all  
>> the right pointers and have all the answers. For instance, I'm still  
>> struggling with lot's of git features and workflow although everything  
>> is documented. Reading all man pages does not really help me for every  
>> use case.
> 
>> 
>> Finally, I answered privately without putting the list in cc  
>> especially to avoid bothering advanced users. I don't really see  
>> anything wrong with that.
> 
> Well, the problem with private answers is that other people on the list
> do not know that you have answered.
> 
Yes that's the problem in fact. I actually only answer on public mailing-list when I'm 100% sure of the answer.

There's always a trade-off between answering privately or publicly. If you wrongly answer just to one person: no big deal. If you answer to the mailing list and are damned wrong, then you expose your ignorance to the project but also to the world :-) Google will always be here to remind you what you once answered and will always dig that out for you from old archives ;-)

Well, I know I'm exaggerating a little bit but it is true (at least for me) that answering publicly on project mailing-lists (open source projects in general) is not always a straightforward consideration.

> I really have no problem with other people than me answering the
> questions, and in fact, I would even be glad if it happened more often.
> And in that case, of course, it would be nice to answer on the list, so
> that I know that the question is answered and I do not have to answer it.
> 
> As for the issue itself, it helps some people to bootstrap them by
> answering their first questions directly. But look at Everett posts, we
> have helped him in each and every step of his work, and he still
> continues to post questions instead of looking for answers himself. We
> simply have to stop at some points, or we will do his work in his stead.
> 
Fair point, I agree. I didn't check the context here in fact.

Thx.

-- Bruno

> -- 
> 					    Gilles.
> 
> _______________________________________________
> Xenomai-help mailing list
> Xenomai-help@domain.hid
> https://mail.gna.org/listinfo/xenomai-help

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Piquesel wrote:
> Hi,
> 
> oops, something went wrong with my previous answer sent from my cell
> phone. I post again then. See inline.
> 
> Le 19 juin 2010 à 12:45, Gilles Chanteperdrix a écrit :
> 
>> Bruno Rouchouse wrote:
>>> Hi Gilles,
>>> 
>>> I do understand your point an mostly agrees with it. What you say
>>> is really common sense.
>>> 
>>> However, I would object 2 points: first it's everyone's freedom
>>> to help someone or not even if it is a dummy question. In fact,
>>> due to my knowledge, I can help only on those ;) Second, it's not
>>> so easy when you start using a technology to find all the right
>>> pointers and have all the answers. For instance, I'm still 
>>> struggling with lot's of git features and workflow although
>>> everything is documented. Reading all man pages does not really
>>> help me for every use case. Finally, I answered privately without
>>> putting the list in cc especially to avoid bothering advanced
>>> users. I don't really see anything wrong with that.
>> Well, the problem with private answers is that other people on the
>> list do not know that you have answered.
>> 
> Yes that's the problem in fact. I actually only answer on public
> mailing-list when I'm 100% sure of the answer.
> 
> There's always a trade-off between answering privately or publicly.
> If you wrongly answer just to one person: no big deal. If you answer
> to the mailing list and are damned wrong, then you expose your
> ignorance to the project but also to the world :-) Google will always
> be here to remind you what you once answered and will always dig that
> out for you from old archives ;-)
> 
> Well, I know I'm exaggerating a little bit but it is true (at least
> for me) that answering publicly on project mailing-lists (open source
> projects in general) is not always a straightforward consideration.

Well, the problem is that if you give a wrong answer privately, there is
no way for anyone to see that you did, whereas if you give a wrong
answer on the list, people can correct you. And his correction can be
found in the mailing list archives. So, please answer on the list, really.

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Bruno Rouchouse wrote:
> Hi Gilles,
> 
> I do understand your point an mostly agrees with it. What you say is  
> really common sense.
> 
> However, I would object 2 points: first it's everyone's freedom to  
> help someone or not even if it is a dummy question. In fact, due to my  
> knowledge, I can help only on those ;)
> 
> Second, it's not so easy when you start using a technology to find all  
> the right pointers and have all the answers. For instance, I'm still  
> struggling with lot's of git features and workflow although everything  
> is documented. Reading all man pages does not really help me for every  
> use case.

Well maybe for git, a simple approach is to set-up some git repository
locally, then try git commands, without any risk to break anything. You
can also set-up a bare repository to play with push and fetch.

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Everett Wang]

On Sat, Jun 19, 2010 at 7:02 PM, Gilles Chanteperdrix
<gilles.chanteperdrix@xenomai.org> wrote:
> Bruno Rouchouse wrote:
>> Hi Gilles,
>>
>> I do understand your point an mostly agrees with it. What you say is
>> really common sense.
>>
>> However, I would object 2 points: first it's everyone's freedom to
>> help someone or not even if it is a dummy question. In fact, due to my
>> knowledge, I can help only on those ;)
>>
>> Second, it's not so easy when you start using a technology to find all
>> the right pointers and have all the answers. For instance, I'm still
>> struggling with lot's of git features and workflow although everything
>> is documented. Reading all man pages does not really help me for every
>> use case.
>
> Well maybe for git, a simple approach is to set-up some git repository
> locally, then try git commands, without any risk to break anything. You
> can also set-up a bare repository to play with push and fetch.
>
> --
>                                            Gilles.
>
> _______________________________________________
> Xenomai-help mailing list
> Xenomai-help@domain.hid
> https://mail.gna.org/listinfo/xenomai-help
>

Hi All,

I am glad that my questions generated some stir. :-) They can be bothersome
for people who know the answers already. I did try to look up the manuals. As
a matter of fact, I always look at manual first when I have problems.
Sometimes the information is scattering in many places and can't be found
easily. IMHO, I think the best way to avoid answering all the
"trivial" questions from
new users is to have a "getting start" for xenomai. Put pointers so people
can find which section of which manual they should read for common encountered
problems.

Cheers,

Everett

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Everett Wang wrote:
> Hi All,
> 
> I am glad that my questions generated some stir. :-) They can be bothersome
> for people who know the answers already. I did try to look up the manuals. As
> a matter of fact, I always look at manual first when I have problems.

Ok, let us see:
- https://mail.gna.org/public/xenomai-help/2010-05/msg00015.html
Off-topic Question about compiling a kernel for Beagle, well for ARM
really, but for beagle, answer is here:
http://elinux.org/BeagleBoard#Linux_kernel

- https://mail.gna.org/public/xenomai-help/2010-05/msg00120.html
Question about compiling Xenomai examples, answer is here:
http://www.xenomai.org/index.php/Examples

- https://mail.gna.org/public/xenomai-help/2010-05/msg00135.html
Question about using Xenomai serial driver, answer is here:
http://www.xenomai.org/index.php/16550A

- https://mail.gna.org/public/xenomai-help/2010-05/msg00166.html
Another question about using Xenomai serial driver, answer at the same
place.

- https://mail.gna.org/public/xenomai-help/2010-06/msg00007.html
Second off-topic question about PPS drivers. Unanswered this time, but
you can easily find references on the web. Such as:
http://www.eecis.udel.edu/~mills/ntp/html/drivers/driver22.html
http://lwn.net/Articles/270773/

- https://mail.gna.org/public/xenomai-help/2010-06/msg00120.html
Question about rt_dev_read errors on serial ports, answered here:
http://www.xenomai.org/documentation/xenomai-head/html/api/group__rtserial.html

- https://mail.gna.org/public/xenomai-help/2010-06/msg00148.html
Thread about getting make to generate dependencies automatically, and
about getting compilation flags to compile applications for xenomai
native skin. Answered here:
http://www.gnu.org/software/make/manual/html_node/Automatic-Prerequisites.html#Automatic-Prerequisites
and here:
http://www.xenomai.org/documentation/branches/v2.3.x/pdf/Native-API-Tour-rev-C.pdf

So, no, you are not reading the documentation, you are using this list
to avoid doing your work.

> Sometimes the information is scattering in many places and can't be found
> easily. IMHO, I think the best way to avoid answering all the
> "trivial" questions from
> new users is to have a "getting start" for xenomai. Put pointers so people
> can find which section of which manual they should read for common encountered
> problems.

As a matter of fact, I agree with you, which is why just before your
mail, I modified this page:
http://www.xenomai.org/index.php/Included_documentation_summary

So as to have many pointers in one place. But documents on Xenomai
website which answered your questions were only a few clicks away from
Xenomai main page:
http://www.xenomai.org
In the "Documentation" sidebar.

One the one hand you tell us that you read the documentation, and on the
other hand you would like pointers to particular parts of the
documentation. Looks to me like you are contradicting yourself, if you
had read the documentation, you would not need us to indicate you what
particular section to read.

So, please stop making excuses, start reading the documentation.

-- 
					    Gilles.

Re: [Xenomai-help] application make file

[Piquesel]

Le 19 juin 2010 à 13:02, Gilles Chanteperdrix a écrit :

> Bruno Rouchouse wrote:
>> Hi Gilles,
>> 
>> I do understand your point an mostly agrees with it. What you say is  
>> really common sense.
>> 
>> However, I would object 2 points: first it's everyone's freedom to  
>> help someone or not even if it is a dummy question. In fact, due to my  
>> knowledge, I can help only on those ;)
>> 
>> Second, it's not so easy when you start using a technology to find all  
>> the right pointers and have all the answers. For instance, I'm still  
>> struggling with lot's of git features and workflow although everything  
>> is documented. Reading all man pages does not really help me for every  
>> use case.
> 
> Well maybe for git, a simple approach is to set-up some git repository
> locally, then try git commands, without any risk to break anything. You
> can also set-up a bare repository to play with push and fetch.
> 
Yes that's what I did in fact. I guess I can post this use case here because it may be of some interest to some other xenomai users.

My workflow is quite standard I think and I did find a way to handle it. Not sure it is the best one though.

I clone locally from xenomai git repository. I create also my own branch on my local repository but I also need a git repository on github in order to access to my tree from different machines.

In terms of git commands, here's what I did:

* Cloned Xenomai repository on my local machine
git clone git://xenomai.org/xenomai-head.git
and created from there my own branch : git branch benchlib

* Pushed once this local copy to github in order to populate my remote repository (git push)

The thing I'm not sure about is now how to handle update process of my local and github repositories when xenomai-head evolves. I need to keep both in sync with Xenomai development tree. Makes sense?

What I do (on my local rep) currently is:
(on my local repository)
git checkout master
git pull (on my local rep) to update my tree with the latest xenomai commits
git checkout benchlib
git rebase master (in order to have my branch in sync with the latest release)

Here comes a first pain: I get plenty of conflicts due to Makefile.in changes. So what I did is just launching the bootstrap script to update them in my tree and then do a:
git rebase --continue

Finally, when my tree is up to date, I still need to update my githup repository and I'm not so clear on how to do that.

When I use git push git@domain.hid, I get some non-fast forward errors. I found some explanations on different forums. I'm not sure I really understand what I'm doing here but I get around this problem like this:

git fetch origin

and then I can push via git push -f git@domain.hid

Well, I don't know if I'm very clear :-) I'll draw a diagram if needed.

Thx.

--Bruno



> -- 
> 					    Gilles.
> 
> _______________________________________________
> Xenomai-help mailing list
> Xenomai-help@domain.hid
> https://mail.gna.org/listinfo/xenomai-help

Re: [Xenomai-help] application make file

[Gilles Chanteperdrix]

Piquesel wrote:
> Le 19 juin 2010 à 13:02, Gilles Chanteperdrix a écrit :
> 
>> Bruno Rouchouse wrote:
>>> Hi Gilles,
>>> 
>>> I do understand your point an mostly agrees with it. What you say
>>> is really common sense.
>>> 
>>> However, I would object 2 points: first it's everyone's freedom
>>> to help someone or not even if it is a dummy question. In fact,
>>> due to my knowledge, I can help only on those ;)
>>> 
>>> Second, it's not so easy when you start using a technology to
>>> find all the right pointers and have all the answers. For
>>> instance, I'm still struggling with lot's of git features and
>>> workflow although everything is documented. Reading all man pages
>>> does not really help me for every use case.
>> Well maybe for git, a simple approach is to set-up some git
>> repository locally, then try git commands, without any risk to
>> break anything. You can also set-up a bare repository to play with
>> push and fetch.
>> 
> Yes that's what I did in fact. I guess I can post this use case here
> because it may be of some interest to some other xenomai users.
> 
> My workflow is quite standard I think and I did find a way to handle
> it. Not sure it is the best one though.
> 
> I clone locally from xenomai git repository. I create also my own
> branch on my local repository but I also need a git repository on
> github in order to access to my tree from different machines.
> 
> In terms of git commands, here's what I did:
> 
> * Cloned Xenomai repository on my local machine git clone
> git://xenomai.org/xenomai-head.git and created from there my own
> branch : git branch benchlib
> 
> * Pushed once this local copy to github in order to populate my
> remote repository (git push)
> 
> The thing I'm not sure about is now how to handle update process of
> my local and github repositories when xenomai-head evolves. I need to
> keep both in sync with Xenomai development tree. Makes sense?
> 
> What I do (on my local rep) currently is: (on my local repository) 
> git checkout master git pull (on my local rep) to update my tree with
> the latest xenomai commits git checkout benchlib git rebase master
> (in order to have my branch in sync with the latest release)
> 
> Here comes a first pain: I get plenty of conflicts due to Makefile.in
> changes. So what I did is just launching the bootstrap script to
> update them in my tree and then do a: git rebase --continue

You probably have conflicts because you made change locally, the answer
is simple: if you want to make changes locally, use the same version of
autotools as me, that is:
autoconf 2.65
automake 1.10.1

> 
> Finally, when my tree is up to date, I still need to update my githup
> repository and I'm not so clear on how to do that.
> 
> When I use git push git@domain.hid, I
> get some non-fast forward errors. I found some explanations on
> different forums. I'm not sure I really understand what I'm doing
> here but I get around this problem like this:
> 
> git fetch origin
> 
> and then I can push via git push -f
> git@domain.hid
> 
> Well, I don't know if I'm very clear :-) I'll draw a diagram if
> needed.

No, I do not get it here. As soon as you rebase, you modify your branch'
history and have to use push -f. There is nothing wrong with that.

-- 
					    Gilles.