3544 save-args matcher could be considerably more robust
3545 save-args matcher should accept saves may be out-of-order
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Robert Mustacchi <rm@joyent.com>

@@ -1,5 +1,6 @@
+
 #
 # This file and its contents are supplied under the terms of the
 # Common Development and Distribution License ("CDDL"), version 1.0.
 # You may only use this file in accordance with the terms of version
 # 1.0 of the CDDL.

@@ -16,22 +17,20 @@
 include $(SRC)/Makefile.master
 include $(SRC)/Makefile.master.64
 
 .KEEP_STATE:
 
-OBJECTS = testmatch.o saveargs.o data.o
+OBJECTS = testmatch.o data.o
 PROG = testmatch
 
-CPPFLAGS += -I$(SRC)/common/saveargs
+LDLIBS64 += -lsaveargs
+
 ASFLAGS += -P
 AS_CPPFLAGS += -D_ASM
 
-%.o: $(SRC)/common/saveargs/%.c
-        $(COMPILE.c) -o $@ $<
-
 $(PROG): $(OBJECTS)
-        $(LINK.c) -o $@ $(OBJECTS) -lc
+        $(LINK.c) -o $@ $(OBJECTS) $(LDLIBS64)
 
 clean:
         $(RM) $(OBJECTS) $(PROG)
 
 clobber: clean