From: Thorsten Kukuk <kukuk@thkukuk.de>
Date: Wed, 26 Nov 2003 10:31:10 +0000 (+0000)
Subject: Relevant BUGIDs: 849545
X-Git-Tag: Linux-PAM-0-78-Beta1~22
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9ab56e3be6dc9a7df2812a64c3d7acbfd385d9fc;p=linux-pam

Relevant BUGIDs: 849545

Purpose of commit: bugfix/cleanup

Commit summary:
---------------
CFLAGS from configure run is ignored by Make.Rules.
modules should build after libpam, so that we can link against libpam.
In one place, "ar" instead of "$(AR)" is used.
---

diff --git a/Make.Rules.in b/Make.Rules.in
index 2aab9bf9..06c97f0a 100644
--- a/Make.Rules.in
+++ b/Make.Rules.in
@@ -92,7 +92,7 @@ CRACKLIB_DICTPATH=@CRACKLIB_DICTPATH@
 # generic build setup
 OS=@OS@
 CC=@CC@
-CFLAGS=$(WARNINGS) -D$(OS) $(OS_CFLAGS) $(HEADER_DIRS) @CONF_CFLAGS@
+CFLAGS=@CFLAGS@ $(WARNINGS) -D$(OS) $(OS_CFLAGS) $(HEADER_DIRS) @CONF_CFLAGS@
 LD=@LD@
 LD_D=@LD_D@
 LD_L=@LD_L@
diff --git a/Makefile b/Makefile
index d4afd221..1ab1b711 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ ifeq ($(shell test \! -f Make.Rules || echo yes),yes)
     include Make.Rules
 endif
 
-THINGSTOMAKE = modules libpam libpamc libpam_misc doc examples
+THINGSTOMAKE = libpam libpamc libpam_misc modules doc examples
 
 all: $(THINGSTOMAKE)
 
diff --git a/libpam/Makefile b/libpam/Makefile
index d87cb028..e2b9649e 100644
--- a/libpam/Makefile
+++ b/libpam/Makefile
@@ -112,7 +112,7 @@ endif
 
 $(LIBPAMSTATIC): $(SLIBOBJECTS)
 ifeq ($(STATIC_LIBPAM),yes)
-	ar cr $@ $(SLIBOBJECTS) $(MODULES)
+	$(AR) cr $@ $(SLIBOBJECTS) $(MODULES)
 	$(RANLIB) $@
 endif