Correctly determine TARGET

Don't just blindly append a ".a" to it

diff --git a/src/modules/rlm_krb5/all.mk.in b/src/modules/rlm_krb5/all.mk.in
index 7fb55ec4327afba384bdaee03c4e925ac19afead..791cf7b4d2f285130c73a8b951ad8973031f8a27 100644 (file)
--- a/src/modules/rlm_krb5/all.mk.in
+++ b/src/modules/rlm_krb5/all.mk.in
@@ -1,4 +1,9 @@
-TARGET         = @targetname@.a
+TARGETNAME     = @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET         = $(TARGETNAME).a
+endif
+
 SOURCES                = rlm_krb5.c
 
 SRC_CFLAGS     = @krb5_cflags@

diff --git a/src/modules/rlm_ldap/all.mk.in b/src/modules/rlm_ldap/all.mk.in
index 9854a3c031fa4d3f4bb178ec07f1df0f698b6e76..274765011f4f7b33ed50d6d4017bf264ddf07fdb 100644 (file)
--- a/src/modules/rlm_ldap/all.mk.in
+++ b/src/modules/rlm_ldap/all.mk.in
@@ -1,4 +1,9 @@
-TARGET         = rlm_ldap.a
+TARGETNAME     = @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET         = $(TARGETNAME).a
+endif
+
 SOURCES                = rlm_ldap.c @edir@
 
 SRC_CFLAGS     = @ldap_cflags@

diff --git a/src/modules/rlm_pam/all.mk.in b/src/modules/rlm_pam/all.mk.in
index 81cd742ee3f98e528330eb046ab2d68108f7f44a..59883d4279fbabe312af701a7ba68f98965cbc2f 100644 (file)
--- a/src/modules/rlm_pam/all.mk.in
+++ b/src/modules/rlm_pam/all.mk.in
@@ -1,4 +1,9 @@
-TARGET         = @targetname@.a
+TARGETNAME     = @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET         = $(TARGETNAME).a
+endif
+
 SOURCES                = rlm_pam.c
 
 SRC_CFLAGS     = @pam_cflags@

diff --git a/src/modules/rlm_perl/all.mk.in b/src/modules/rlm_perl/all.mk.in
index 2fcd156e149dc388430eda228570f3de8f1b12a1..f697657d0bc652563933a7e628c401e717c9ac9d 100644 (file)
--- a/src/modules/rlm_perl/all.mk.in
+++ b/src/modules/rlm_perl/all.mk.in
@@ -1,4 +1,9 @@
-TARGET         = @targetname@.a
+TARGETNAME     = @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET         = $(TARGETNAME).a
+endif
+
 SOURCES                = rlm_perl.c
 
 SRC_CFLAGS     = @perl_cflags@

diff --git a/src/modules/rlm_python/all.mk.in b/src/modules/rlm_python/all.mk.in
index ebc8204c976c8aab6be4c402c2835babc022dcda..19bfedc66b4d830a39b79cf1cbb8001046e4127c 100644 (file)
--- a/src/modules/rlm_python/all.mk.in
+++ b/src/modules/rlm_python/all.mk.in
@@ -1,4 +1,9 @@
-TARGET         = @targetname.a
+TARGETNAME     = @targetname@
+
+ifneq "$(TARGETNAME)" ""
+TARGET         = $(TARGETNAME).a
+endif
+
 SOURCES                = rlm_python.c
 
 TGT_LDLIBS     = @python_ldflags@