Cluster Project branch, STABLE2, updated. cluster-2.03.03-19-gfb68486

Cluster Project branch, STABLE2, updated. cluster-2.03.03-19-gfb68486

[fabbione]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=fb6848630440a0cb6931ec476c2d87329ba4dce5

The branch, STABLE2 has been updated
       via  fb6848630440a0cb6931ec476c2d87329ba4dce5 (commit)
      from  41eb23b17a99c9392829d721b1c3de989ab77941 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fb6848630440a0cb6931ec476c2d87329ba4dce5
Author: Fabio M. Di Nitto <fdinitto@redhat.com>
Date:   Mon Jun 9 21:18:08 2008 +0200

    [BUILD] Clean up standard libraries Makefiles
    
    Fix libdlm linking order.
    
    Standardize invokation to AR.
    
    Signed-off-by: Fabio M. Di Nitto <fdinitto@redhat.com>

-----------------------------------------------------------------------

Summary of changes:
 ccs/lib/Makefile   |    2 +-
 cman/lib/Makefile  |    2 +-
 dlm/lib/Makefile   |    8 ++++----
 group/lib/Makefile |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ccs/lib/Makefile b/ccs/lib/Makefile
index cfcbb2a..5fd759a 100644
--- a/ccs/lib/Makefile
+++ b/ccs/lib/Makefile
@@ -33,7 +33,7 @@ CFLAGS += -I${incdir}
 
 
 ${TARGET}: ${OBJS}
-	${AR} cr $@ $^
+	${AR} cru $@ $^
 	${RANLIB} $@
 
 log.c:
diff --git a/cman/lib/Makefile b/cman/lib/Makefile
index fbc4a28..f187085 100644
--- a/cman/lib/Makefile
+++ b/cman/lib/Makefile
@@ -38,7 +38,7 @@ CFLAGS += -I${cmanincdir} -I$(S)/../daemon
 CFLAGS += -I${incdir}
 
 $(TARGET).a: $(TARGET).o
-	${AR} r $@ $^
+	${AR} cru $@ $^
 	${RANLIB} $@
 
 $(TARGET).so.${SOMAJOR}.${SOMINOR}: $(TARGET).o
diff --git a/dlm/lib/Makefile b/dlm/lib/Makefile
index b223df7..d4e53fb 100644
--- a/dlm/lib/Makefile
+++ b/dlm/lib/Makefile
@@ -48,20 +48,20 @@ CFLAGS += -I$(KERNEL_SRC)/include
 PTHREAD_LDFLAGS += -lpthread 
 
 $(TARGET).a: $(TARGET).o $(AISTARGET).o
-	${AR} r $@ $^
+	${AR} cru $@ $^
 	${RANLIB} $@
 
 $(TARGET)_lt.a: $(TARGET)_lt.o
-	${AR} r $@ $^
+	${AR} cru $@ $^
 	${RANLIB} $@
 
 $(TARGET).so.${SOMAJOR}.${SOMINOR}: $(TARGET).po $(AISTARGET).po
-	$(CC) $(PTHREAD_LDFLAGS) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $<
+	$(CC) -shared -o $@ -Wl,-soname=$(TARGET).so.$(SOMAJOR) $< $(PTHREAD_LDFLAGS) $(LDFLAGS)
 	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so
 	ln -sf $(TARGET).so.$(SOMAJOR).$(SOMINOR) $(TARGET).so.$(SOMAJOR)
 
 $(TARGET)_lt.so.${SOMAJOR}.${SOMINOR}: $(TARGET)_lt.po
-	$(CC) $(LDFLAGS) -shared -o $@ -Wl,-soname=$(TARGET)_lt.so.$(SOMAJOR) $<
+	$(CC) -shared -o $@ -Wl,-soname=$(TARGET)_lt.so.$(SOMAJOR) $< $(LDFLAGS)
 	ln -sf $(TARGET)_lt.so.$(SOMAJOR).$(SOMINOR) $(TARGET)_lt.so
 	ln -sf $(TARGET)_lt.so.$(SOMAJOR).$(SOMINOR) $(TARGET)_lt.so.$(SOMAJOR)
 
diff --git a/group/lib/Makefile b/group/lib/Makefile
index 051164c..fc51f97 100644
--- a/group/lib/Makefile
+++ b/group/lib/Makefile
@@ -26,7 +26,7 @@ CFLAGS += -I${incdir}
 
 
 $(TARGET).a: $(TARGET).o
-	${AR} r $@ $^
+	${AR} cru $@ $^
 	${RANLIB} $@
 
 clean: generalclean


hooks/post-receive
--
Cluster Project