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 2aab9bf98d4a2ad5a651ef5e6e6c99849c78c2d8..06c97f0a2519dde749a0be574ab56d01fd0a1c35 100644 (file)
--- 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 d4afd22143913afbbf721b1623dc0fe29e256c9f..1ab1b711ae2689c21957e7a3498f964b9b182dc8 100644 (file)
--- 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 d87cb028855d0c744fb6d2bf45e797d041b22676..e2b9649ef1a9928f399b8d55c366a0c598d0b58e 100644 (file)
--- 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