X-Git-Url: https://pd.if.org/git/?p=uuid;a=blobdiff_plain;f=Makefile;h=4814ee0dad4183bcc7a070683eeec34924ec0653;hp=f2e67a9fcae6eefcd4623f37fbfc37c52ff3b35f;hb=HEAD;hpb=8928a8db86c5502243e619a7db757a324f859fd2

diff --git a/Makefile b/Makefile
index f2e67a9..4814ee0 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ CFLAGS=-Wall -I. -L.
 # set the following for windows
 #LDFLAGS += -liphlpapi
 
-all:	libpduuid.a
+all:	libpduuid.a uuidgen
 
 windows:	libpduuid.a uuidgen.o
 	$(CC) $(CFLAGS) -Wall -L. -o $@ uuidgen.o -lpduuid $(LDFLAGS) -liphlpapi
@@ -17,10 +17,10 @@ libpduuid.a:	$(OBJ)
 	ar rcuv $@ $+
 	ranlib $@
 
-t/%.t:	t/%.o t/ctap.o
-	$(CC) $(CFLAGS) -Wall -I. -o $@ $+ -lpduuid
+t/%.t:	t/%.o t/ctap.o libpduuid.a
+	$(CC) $(CFLAGS) -Wall -I. -o $@ $< t/ctap.o -lpduuid
 
-test:	t/uuidgen.t libpduuid.a
+test:	t/md5.t t/sha1.t t/uuidgen.t libpduuid.a
 	prove t/*.t
 
 md5.o:	md5.c
@@ -35,8 +35,11 @@ rng.o:	rng.c
 internal.o:	internal.c
 	$(CC) $(CFLAGS) -Wall -fPIC -c -o $@ $+
 
-uuidgen:	libpduuid.a uuidgen.o
-	$(CC) $(CFLAGS) -Wall -L. -o $@ uuidgen.o -lpduuid $(LDFLAGS)
+uuidgen2:	libpduuid.a uuidgen2.o
+	$(CC) $(CFLAGS) -Wall -L. -o $@ uuidgen2.o -lpduuid $(LDFLAGS)
+
+uuidgen:	libpduuid.a uuidgen.o warn.o
+	$(CC) $(CFLAGS) -Wall -L. -o $@ uuidgen.o warn.o -lpduuid $(LDFLAGS)
 
 clean:
 	rm -f *.o *.a uuidgen postgres/*.o postgres/*.so