Fix gen-deps.sh for cross-builds

2 files changed, 13 insertions, 3 deletions

diff --git a/package/deps.mak b/package/deps.mak
index 59c6f2a..aa9d239 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -5,6 +5,9 @@
 src/include/pamela/pam.h: src/include/pamela/pamela.h
 src/include/pamela/pamela.h: src/include/pamela/common.h
 src/pamela/pamela-internal.h: src/include/pamela/pamela.h
+src/compat/misc_conv.o src/compat/misc_conv.lo: src/compat/misc_conv.c src/include/pamela/compat.h src/include/pamela/pam.h
+src/compat/pam_misc_drop_env.o src/compat/pam_misc_drop_env.lo: src/compat/pam_misc_drop_env.c src/include/pamela/compat.h
+src/compat/pam_misc_paste_env.o src/compat/pam_misc_paste_env.lo: src/compat/pam_misc_paste_env.c src/include/pamela/compat.h src/include/pamela/pam.h
 src/pamela/pam_acct_mgmt.o src/pamela/pam_acct_mgmt.lo: src/pamela/pam_acct_mgmt.c src/include/pamela/pam.h src/include/pamela/pamela.h
 src/pamela/pam_authenticate.o src/pamela/pam_authenticate.lo: src/pamela/pam_authenticate.c src/include/pamela/pam.h src/include/pamela/pamela.h
 src/pamela/pam_chauthtok.o src/pamela/pam_chauthtok.lo: src/pamela/pam_chauthtok.c src/include/pamela/pam.h src/include/pamela/pamela.h
@@ -35,11 +38,18 @@ src/pamela/pamela_zero.o src/pamela/pamela_zero.lo: src/pamela/pamela_zero.c src
 src/pamela/pamelad.o src/pamela/pamelad.lo: src/pamela/pamelad.c src/include/pamela/common.h
 
 ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
+libpamela-compat.a.xyzzy: src/compat/
+else
+libpamela-compat.a.xyzzy: src/compat/
+endif
+libpamela-compat.so.xyzzy: EXTRA_LIBS :=
+libpamela-compat.so.xyzzy: src/compat/
+ifeq ($(strip $(STATIC_LIBS_ARE_PIC)),)
 libpamela.a.xyzzy: src/pamela/pam_acct_mgmt.o src/pamela/pam_authenticate.o src/pamela/pam_chauthtok.o src/pamela/pam_close_session.o src/pamela/pam_end.o src/pamela/pam_fail_delay.o src/pamela/pam_get_item.o src/pamela/pam_getenv.o src/pamela/pam_getenvlist.o src/pamela/pam_open_session.o src/pamela/pam_putenv.o src/pamela/pam_set_item.o src/pamela/pam_setcred.o src/pamela/pam_start.o src/pamela/pam_strerror.o src/pamela/pamela_end.o src/pamela/pamela_get_item.o src/pamela/pamela_getenvlist.o src/pamela/pamela_op.o src/pamela/pamela_pam_response_free.o src/pamela/pamela_query_string.o src/pamela/pamela_set_item.o src/pamela/pamela_set_item_internal.o src/pamela/pamela_set_itemv.o src/pamela/pamela_startf.o src/pamela/pamela_strerror.o src/pamela/pamela_zero.o
 else
 libpamela.a.xyzzy: src/pamela/pam_acct_mgmt.lo src/pamela/pam_authenticate.lo src/pamela/pam_chauthtok.lo src/pamela/pam_close_session.lo src/pamela/pam_end.lo src/pamela/pam_fail_delay.lo src/pamela/pam_get_item.lo src/pamela/pam_getenv.lo src/pamela/pam_getenvlist.lo src/pamela/pam_open_session.lo src/pamela/pam_putenv.lo src/pamela/pam_set_item.lo src/pamela/pam_setcred.lo src/pamela/pam_start.lo src/pamela/pam_strerror.lo src/pamela/pamela_end.lo src/pamela/pamela_get_item.lo src/pamela/pamela_getenvlist.lo src/pamela/pamela_op.lo src/pamela/pamela_pam_response_free.lo src/pamela/pamela_query_string.lo src/pamela/pamela_set_item.lo src/pamela/pamela_set_item_internal.lo src/pamela/pamela_set_itemv.lo src/pamela/pamela_startf.lo src/pamela/pamela_strerror.lo src/pamela/pamela_zero.lo
 endif
 libpamela.so.xyzzy: EXTRA_LIBS :=
 libpamela.so.xyzzy: src/pamela/pam_acct_mgmt.lo src/pamela/pam_authenticate.lo src/pamela/pam_chauthtok.lo src/pamela/pam_close_session.lo src/pamela/pam_end.lo src/pamela/pam_fail_delay.lo src/pamela/pam_get_item.lo src/pamela/pam_getenv.lo src/pamela/pam_getenvlist.lo src/pamela/pam_open_session.lo src/pamela/pam_putenv.lo src/pamela/pam_set_item.lo src/pamela/pam_setcred.lo src/pamela/pam_start.lo src/pamela/pam_strerror.lo src/pamela/pamela_end.lo src/pamela/pamela_get_item.lo src/pamela/pamela_getenvlist.lo src/pamela/pamela_op.lo src/pamela/pamela_pam_response_free.lo src/pamela/pamela_query_string.lo src/pamela/pamela_set_item.lo src/pamela/pamela_set_item_internal.lo src/pamela/pamela_set_itemv.lo src/pamela/pamela_startf.lo src/pamela/pamela_strerror.lo src/pamela/pamela_zero.lo
-pamelad: EXTRA_LIBS := ${PAM_LIB}
-pamelad: src/pamela/pamelad.o -lskarnet
+pamelad: EXTRA_LIBS := -lskarnet ${PAM_LIB}
+pamelad: src/pamela/pamelad.o
diff --git a/tools/gen-deps.sh b/tools/gen-deps.sh
index 6383ac2..27e5b3e 100755
--- a/tools/gen-deps.sh
+++ b/tools/gen-deps.sh
@@ -81,7 +81,7 @@ for dir in $(ls -1 src | grep -v ^include) ; do
       if echo $dep | grep -q -- \\.o$ ; then
         dep="src/$dir/$dep"
       fi
-      if echo $dep | grep -q -- '^\${.*_LIB}' ; then
+      if echo $dep | grep -q -e ^-l -e '^\${.*_LIB}' ; then
         libs="$libs $dep"
       else
         deps="$deps $dep"