From 720e37e77c3dd04e91345c232bfb12d00b1d1539 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 15 Sep 2021 10:43:30 +0200 Subject: [PATCH] Do some library reorder to fix linking problem in druc. --- alliance/src/autostuff | 4 ++-- alliance/src/druc/src/Makefile.am | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/alliance/src/autostuff b/alliance/src/autostuff index 47f78895..d19eac14 100755 --- a/alliance/src/autostuff +++ b/alliance/src/autostuff @@ -75,14 +75,14 @@ for dir in $dirs; do if [ ! -f "$dir/Makefile.am" ]; then continue; fi newdirs="$newdirs $dir" done -dirs="$newdirs documentation" +dirs="$newdirs" ## Order directories. order="mbk \ aut rds elp abl bdd log btr vex ctl ctp abe abt \ 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="" for lib in $order; do if echo "$dirs" | grep $lib > /dev/null ; then diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am index b3801865..59292cbd 100644 --- a/alliance/src/druc/src/Makefile.am +++ b/alliance/src/druc/src/Makefile.am @@ -26,7 +26,7 @@ AM_CFLAGS = -I$(top_srcdir)/mbk/src -I$(top_srcdir)/rds/src druc_LDADD = $(ALLIANCE_LIBS) -L. libVrd.la \ -L$(builddir)/../../rds/src -lRds \ --L$(builddir)/../../mbk/src -lMpu -lMut -lMph +-L$(builddir)/../../mbk/src -lMpu -lMut -lMph -lMgn druc_SOURCES = \ drucbath.c drucbath.h