--- a/Meerwald/Makefile	Tue Sep 21 13:40:51 2010 +0200
+++ b/Meerwald/Makefile	Sat Jan 28 23:54:58 2023 +0100
@@ -27,13 +27,13 @@
 	$(CC) $(CFLAGS) $(INCLUDES) $(OPTIONS) -o $@ -c $<
 
 .1.ps:
-	$(GROFF) $< > $@ 
+	$(GROFF) $< > $@
 
 # library containing general stuff
 
-$(LIBPREFIX)wm$(LIB): dct$(O) coeff$(O) gray$(O) sort$(O) signature$(O) coord$(O) wm$(O)
+$(LIBPREFIX)wm$(LIB): dct$(O) coeff$(O) gray$(O) sort$(O) signature-utils$(O) coord$(O) wm$(O)
 	$(RM) $@
-	ar -rc $@ dct$(O) coeff$(O) gray$(O) sort$(O) signature$(O) coord$(O) wm$(O)
+	ar -rc $@ dct$(O) coeff$(O) gray$(O) sort$(O) signature-utils$(O) coord$(O) wm$(O)
 
 libraryclean:
 	$(RM) $(LIBPREFIX)wm$(LIB)
@@ -162,8 +162,8 @@
 wm_bruyn_d$(EXE): wm_bruyn_d$(O)  bruyn_common$(O) $(LIBPREFIX)wm$(LIB)
 	$(CC) $(LDFLAGS) -o $@  wm_bruyn_d$(O) bruyn_common$(O) $(WMLIB) $(LIBS) $(PGMLIBS)
 
-gen_bruyn_sig$(EXE): gen_bruyn_sig$(O) wm$(O)
-	$(CC) $(LDFLAGS) -o $@ gen_bruyn_sig$(O) wm$(O) $(LIBS)
+gen_bruyn_sig$(EXE): gen_bruyn_sig$(O) wm$(O) $(LIBPREFIX)wm$(LIB)
+	$(CC) $(LDFLAGS) -o $@ gen_bruyn_sig$(O) wm$(O) $(WMLIB)
 
 cmp_bruyn_sig$(EXE): cmp_bruyn_sig$(O) $(LIBPREFIX)wm$(LIB)
 	$(CC) $(LDFLAGS) -o $@ cmp_bruyn_sig$(O) $(WMLIB) $(LIBS)
@@ -176,7 +176,7 @@
 coxtest: cox
 	gen_cox_sig$(EXE) > ../sigs/cox.sig
 	wm_cox_e$(EXE) -s ../sigs/cox.sig -o ../watermarked/cox_lena.pgm ../images/lena.pgm
-	wm_cox_d$(EXE) -s ../sigs/cox.sig -o ../wms/cox.wm -i ../images/lena.pgm ../watermarked/cox_lena.pgm 
+	wm_cox_d$(EXE) -s ../sigs/cox.sig -o ../wms/cox.wm -i ../images/lena.pgm ../watermarked/cox_lena.pgm
 	cmp_cox_sig$(EXE) -s ../sigs/cox.sig ../wms/cox.wm
 
 coxinstall: cox
@@ -207,7 +207,7 @@
 corvitest: corvi
 	gen_corvi_sig$(EXE) > ../sigs/corvi.sig
 	wm_corvi_e$(EXE) -s ../sigs/corvi.sig -o ../watermarked/corvi_lena.pgm ../images/lena.pgm
-	wm_corvi_d$(EXE) -s ../sigs/corvi.sig -o ../wms/corvi.wm -i ../images/lena.pgm ../watermarked/corvi_lena.pgm 
+	wm_corvi_d$(EXE) -s ../sigs/corvi.sig -o ../wms/corvi.wm -i ../images/lena.pgm ../watermarked/corvi_lena.pgm
 	cmp_corvi_sig$(EXE) -s ../sigs/corvi.sig ../wms/corvi.wm
 
 corviinstall: corvi
@@ -238,7 +238,7 @@
 xiatest: xia
 	gen_xia_sig$(EXE) > ../sigs/xia.sig
 	wm_xia_e$(EXE) -s ../sigs/xia.sig -o ../watermarked/xia_lena.pgm ../images/lena.pgm
-	wm_xia_d$(EXE) -s ../sigs/xia.sig -o ../wms/xia.wm -i ../images/lena.pgm ../watermarked/xia_lena.pgm 
+	wm_xia_d$(EXE) -s ../sigs/xia.sig -o ../wms/xia.wm -i ../images/lena.pgm ../watermarked/xia_lena.pgm
 	cmp_xia_sig$(EXE) -s ../sigs/xia.sig ../wms/xia.wm
 
 xiainstall: xia
@@ -268,7 +268,7 @@
 wangtest: wang
 	gen_wang_sig$(EXE) -n 1000 > ../sigs/wang.sig
 	wm_wang_e$(EXE) -s ../sigs/wang.sig -o ../watermarked/wang_lena.pgm ../images/lena.pgm
-	wm_wang_d$(EXE) -s ../sigs/wang.sig -o ../wms/wang.wm -i ../images/lena.pgm ../watermarked/wang_lena.pgm 
+	wm_wang_d$(EXE) -s ../sigs/wang.sig -o ../wms/wang.wm -i ../images/lena.pgm ../watermarked/wang_lena.pgm
 	cmp_wang_sig$(EXE) -s ../sigs/wang.sig ../wms/wang.wm
 
 wanginstall: wang
@@ -298,7 +298,7 @@
 kimtest: kim
 	gen_kim_sig$(EXE) -n 1000 > ../sigs/kim.sig
 	wm_kim_e$(EXE) -s ../sigs/kim.sig -o ../watermarked/kim_lena.pgm ../images/lena.pgm
-	wm_kim_d$(EXE) -s ../sigs/kim.sig -o ../wms/kim.wm -i ../images/lena.pgm ../watermarked/kim_lena.pgm 
+	wm_kim_d$(EXE) -s ../sigs/kim.sig -o ../wms/kim.wm -i ../images/lena.pgm ../watermarked/kim_lena.pgm
 	cmp_kim_sig$(EXE) -s ../sigs/kim.sig ../wms/kim.wm
 
 kiminstall: kim
@@ -328,7 +328,7 @@
 zhutest: zhu
 	gen_zhu_sig$(EXE) > ../sigs/zhu.sig
 	wm_zhu_e$(EXE) -s ../sigs/zhu.sig -o ../watermarked/zhu_lena.pgm ../images/lena.pgm
-	wm_zhu_d$(EXE) -s ../sigs/zhu.sig -o ../wms/zhu.wm -i ../images/lena.pgm ../watermarked/zhu_lena.pgm 
+	wm_zhu_d$(EXE) -s ../sigs/zhu.sig -o ../wms/zhu.wm -i ../images/lena.pgm ../watermarked/zhu_lena.pgm
 	cmp_zhu_sig$(EXE) -s ../sigs/zhu.sig ../wms/zhu.wm
 
 zhuinstall: zhu
@@ -432,8 +432,8 @@
 wm_kund2_d$(EXE): wm_kund2_d$(O) $(LIBPREFIX)wm$(LIB) $(LIBPREFIX)wavelet$(LIB)
 	$(CC) $(LDFLAGS) -o $@  wm_kund2_d$(O) $(WMLIB) $(WAVELIB) $(LIBS) $(PGMLIBS)
 
-gen_kund2_sig$(EXE): gen_kund2_sig$(O) wm$(O) signature$(O)
-	$(CC) $(LDFLAGS) -o $@ gen_kund2_sig$(O) wm$(O) signature$(O) $(LIBS)
+gen_kund2_sig$(EXE): gen_kund2_sig$(O) wm$(O) signature-utils$(O)
+	$(CC) $(LDFLAGS) -o $@ gen_kund2_sig$(O) wm$(O) signature-utils$(O) $(LIBS)
 
 cmp_kund2_sig$(EXE): cmp_kund2_sig$(O) $(LIBPREFIX)wm$(LIB)
 	$(CC) $(LDFLAGS) -o $@ cmp_kund2_sig$(O) $(WMLIB) $(LIBS)
@@ -448,7 +448,7 @@
 kund3test: kund3
 	gen_kund3_sig$(EXE) -n 1000 -l 2 -q 2 gen_kund3_sig.c > ../sigs/kund3.sig
 	wm_kund3_e$(EXE) -s ../sigs/kund3.sig -o ../watermarked/kund3_lena.pgm ../images/lena.pgm
-	wm_kund3_d$(EXE) -s ../sigs/kund3.sig -o ../wms/kund3.wm ../watermarked/kund3_lena.pgm 
+	wm_kund3_d$(EXE) -s ../sigs/kund3.sig -o ../wms/kund3.wm ../watermarked/kund3_lena.pgm
 	cmp_kund3_sig$(EXE) -s ../sigs/kund3.sig ../wms/kund3.wm
 
 kund3install: kund3
@@ -462,8 +462,8 @@
 wm_kund3_d$(EXE): wm_kund3_d$(O) $(LIBPREFIX)wm$(LIB) $(LIBPREFIX)wavelet$(LIB)
 	$(CC) $(LDFLAGS) -o $@  wm_kund3_d$(O) $(WMLIB) $(WAVELIB) $(LIBS) $(PGMLIBS)
 
-gen_kund3_sig$(EXE): gen_kund3_sig$(O) wm$(O) signature$(O)
-	$(CC) $(LDFLAGS) -o $@ gen_kund3_sig$(O) wm$(O) signature$(O) $(LIBS)
+gen_kund3_sig$(EXE): gen_kund3_sig$(O) wm$(O) signature-utils$(O)
+	$(CC) $(LDFLAGS) -o $@ gen_kund3_sig$(O) wm$(O) signature-utils$(O) $(LIBS)
 
 cmp_kund3_sig$(EXE): cmp_kund3_sig$(O) $(LIBPREFIX)wm$(LIB)
 	$(CC) $(LDFLAGS) -o $@ cmp_kund3_sig$(O) $(WMLIB) $(LIBS)
@@ -505,8 +505,7 @@
 
 clean:	coxclean bruynclean kochclean corviclean xiaclean zhuclean xieclean kund3clean kund2clean \
 	dugadclean kimclean wangclean frid2clean toolsclean libraryclean waveletclean xie2clean
-	$(RM) *$(O) *.ps ../sigs/* ../wms/* ../watermarked/* 
-	
+	$(RM) *$(O) *.ps ../sigs/* ../wms/* ../watermarked/*
 
 man:	coxman bruynman kochman corviman xiaman xieman toolsman