Avoid merging conflit

[cyberium]

Purpose :

Avoid conflit when pulling from another repository. (or between 2 patch)

Case :

AHBOT and PLAYERBOT need to modify same file in the same place.

What file :

original Makefile.am

## Sub-directories to parse

The problem :

ahbot Makefile.am

## Sub-directories to parse
SUBDIRS = AuctionHouseBot

playerbot Makefile.am

## Sub-directories to parse
SUBDIRS = playerbot

goal :

## Sub-directories to parse
SUBDIRS = AuctionHouseBot playerbot

or

## Sub-directories to parse
SUBDIRS = AuctionHouseBot
SUBDIRS+ = playerbot 

Didn't found any clean way to avoid merge conflit in all case. (ahbot first or playerbot first)

Any proposal are welcome.

[Schmoozerd]

it's a bit messy, but

http://www.gnu.org/software/make/manual/make.html#Conditional-Syntax

could perhaps help for this