std C/C++ patch #2

[David Scott Page]

Hi,

This patch to the build mechanism is to 1) allow commands other than
"ar cru" to create archives (necessary for archive template "closure"
by, e.g., KCC and Sun CC); and 2) placate make when using compilers
that don't support gcc's -MD: the generation of dependency information
as a side effect of compilation (a temporary fix to simply ignore
dependency generation until a more general solution can be
implemented).

--
Scott Page

diff -Naur click-stdC++.1/configure.in click-stdC++.2/configure.in
--- click-stdC++.1/configure.in	Sun Apr 14 18:20:42 2002
+++ click-stdC++.2/configure.in	Wed Apr 24 20:25:08 2002
@@ -26,7 +26,7 @@
 
 CLICK_PROG_KERNEL_CXX
 
-AC_CHECK_TOOL(AR, ar)
+AC_CHECK_TOOL(AR, ar cru)
 AC_CHECK_TOOL(LD, ld)
 AC_CHECK_TOOL(RANLIB, ranlib, :)
 AC_CHECK_TOOL(STRIP, strip, :)
diff -Naur click-stdC++.1/tools/lib/Makefile.in click-stdC++.2/tools/lib/Makefile.in
--- click-stdC++.1/tools/lib/Makefile.in	Mon Dec 10 04:18:14 2001
+++ click-stdC++.2/tools/lib/Makefile.in	Wed Apr 24 20:25:08 2002
@@ -34,22 +34,22 @@
 
 .c.o:
 	$(COMPILE) -c $<
-	@/bin/mv $*.d $*.hd
+	-@/bin/mv $*.d $*.hd
 .s.o:
 	$(COMPILE) -c $<
-	@/bin/mv $*.d $*.hd
+	-@/bin/mv $*.d $*.hd
 .S.o:
 	$(COMPILE) -c $<
-	@/bin/mv $*.d $*.hd
+	-@/bin/mv $*.d $*.hd
 .cc.o:
 	$(CXXCOMPILE) -c $<
-	@/bin/mv $*.d $*.hd
+	-@/bin/mv $*.d $*.hd
 .c.bo:
 	$(BUILD_COMPILE) -c $< -o $@
-	@sed 's/\.o:/\.bo:/' < $*.d > $*.bd; /bin/rm -f $*.d
+	- at sed 's/\.o:/\.bo:/' < $*.d > $*.bd; /bin/rm -f $*.d
 .cc.bo:
 	$(BUILD_CXXCOMPILE) -c $< -o $@
-	@sed 's/\.o:/\.bo:/' < $*.d > $*.bd; /bin/rm -f $*.d
+	- at sed 's/\.o:/\.bo:/' < $*.d > $*.bd; /bin/rm -f $*.d
 
 
 OBJS = vectori.o vectorv.o bitvector.o hashmapi.o straccum.o string.o error.o \
@@ -86,10 +86,10 @@
 endif
 
 libclicktool.a: Makefile $(OBJS)
-	$(AR) cru libclicktool.a $(OBJS)
+	$(AR) libclicktool.a $(OBJS)
 	$(RANLIB) libclicktool.a
 libclicktool_build.a: Makefile $(BUILDOBJS)
-	$(BUILD_AR) cru libclicktool_build.a $(BUILDOBJS)
+	$(BUILD_AR) libclicktool_build.a $(BUILDOBJS)
 	$(BUILD_RANLIB) libclicktool_build.a
 
 Makefile: $(srcdir)/Makefile.in
diff -Naur click-stdC++.1/userlevel/Makefile.in click-stdC++.2/userlevel/Makefile.in
--- click-stdC++.1/userlevel/Makefile.in	Wed Mar 13 23:22:43 2002
+++ click-stdC++.2/userlevel/Makefile.in	Wed Apr 24 20:25:08 2002
@@ -87,7 +87,7 @@
 	$(CXXLINK) -rdynamic $(OBJS) libclick.a $(LIBS)
 
 libclick.a: Makefile $(LIBOBJS)
-	$(AR) cru libclick.a $(LIBOBJS)
+	$(AR) libclick.a $(LIBOBJS)
 	$(RANLIB) libclick.a
 
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status