Do some library reorder to fix linking problem in druc.

This commit is contained in:
Jean-Paul Chaput 2021-09-15 10:43:30 +02:00
parent 5e83c92d03
commit 720e37e77c
2 changed files with 3 additions and 3 deletions

View File

@ -75,14 +75,14 @@ for dir in $dirs; do
if [ ! -f "$dir/Makefile.am" ]; then continue; fi if [ ! -f "$dir/Makefile.am" ]; then continue; fi
newdirs="$newdirs $dir" newdirs="$newdirs $dir"
done done
dirs="$newdirs documentation" dirs="$newdirs"
## Order directories. ## Order directories.
order="mbk \ order="mbk \
aut rds elp abl bdd log btr vex ctl ctp abe abt \ aut rds elp abl bdd log btr vex ctl ctp abe abt \
abv fsm fks fvh ftl rtn rtd scl vpn vbh pat gcp \ abv fsm fks fvh ftl rtn rtd scl vpn vbh pat gcp \
druc beh bhl bvl gscr" genlib druc beh bhl bvl gscr"
ordered_dirs="" ordered_dirs=""
for lib in $order; do for lib in $order; do
if echo "$dirs" | grep $lib > /dev/null ; then if echo "$dirs" | grep $lib > /dev/null ; then

View File

@ -26,7 +26,7 @@ AM_CFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src
druc_LDADD = $(ALLIANCE_LIBS) -L. libVrd.la \ druc_LDADD = $(ALLIANCE_LIBS) -L. libVrd.la \
-L$(builddir)/../../rds/src -lRds \ -L$(builddir)/../../rds/src -lRds \
-L$(builddir)/../../mbk/src -lMpu -lMut -lMph -L$(builddir)/../../mbk/src -lMpu -lMut -lMph -lMgn
druc_SOURCES = \ druc_SOURCES = \
drucbath.c drucbath.h drucbath.c drucbath.h