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 7fb55ec..791cf7b 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 9854a3c..2747650 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 81cd742..59883d4 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 2fcd156..f697657 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 ebc8204..19bfedc 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@