--- a/Meerwald/Makefile	Tue Aug 14 19:59:48 2007 +0200
+++ b/Meerwald/Makefile	Tue Aug 14 21:11:21 2007 +0200
@@ -1,25 +1,30 @@
 # Makefile
 
-# choose build platform
+# chose build plattform
 include ../make/make.config
 
+OPTIONS=-DPARAM_STUFF -DPOLLEN_STUFF
+
 all: 	tools \
 	bruyn \
 	koch \
 	corvi \
 	xia \
 	xie \
+	xie2 \
 	cox \
 	zhu \
 	dugad \
 	wang \
 	frid2 \
-	kim
+	kim \
+	kund2 \
+	kund3
 
 .SUFFIXES: .c .o .1 .ps
 
 .c$(O):
-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ -c $<
+	$(CC) $(CFLAGS) $(INCLUDES) $(OPTIONS) -o $@ -c $<
 
 .1.ps:
 	$(GROFF) $< > $@ 
@@ -54,10 +59,10 @@
 toolsman: cmp_pgm.ps cmp_dct8x8.ps cmp_dct.ps
 
 toolsclean:
-	$(RM) cmp_pgm$(EXE) cmp_dct$(EXE) cmp_dct8x8$(EXE)
+	$(RM) cmp_pgm$(EXE) cmp_dct$(EXE) cmp_dct8x8$(EXE) cmp_dwt$(EXE)
 
 cmp_pgm$(EXE):  cmp_pgm$(O) $(LIBPREFIX)wm$(LIB)
-	$(CC) $(LDFLAGS) -o $@ cmp_pgm$(O) $(WMLIB) $(PGMLIBS)
+	$(CC) $(LDFLAGS) -o $@ cmp_pgm$(O) $(WMLIB) $(PGMLIBS) $(LIBS)
 
 cmp_dct$(EXE):  cmp_dct$(O) $(LIBPREFIX)wm$(LIB)
 	$(CC) $(LDFLAGS) -o $@ cmp_dct$(O) $(WMLIB) $(PGMLIBS)
@@ -373,6 +378,96 @@
 xieclean:
 	$(RM) gen_xie_sig$(EXE) wm_xie_e$(EXE) wm_xie_d$(EXE) cmp_xie_sig$(EXE)
 
+# Xie2's algorithm (DWT, blind, binary, quantization, approximation image)
+
+xie2: gen_xie2_sig$(EXE) wm_xie2_e$(EXE) wm_xie2_d$(EXE) cmp_xie2_sig$(EXE)
+
+xie2test: xie2
+	gen_xie2_sig$(EXE) -n 800 gen_xie2_sig.c > ../sigs/xie2.sig
+	wm_xie2_e$(EXE) -s ../sigs/xie2.sig -o ../watermarked/xie2_lena.pgm ../images/lena.pgm
+	wm_xie2_d$(EXE) -s ../sigs/xie2.sig -o ../wms/xie2.wm ../watermarked/xie2_lena.pgm 
+	cmp_xie2_sig$(EXE) -s ../sigs/xie2.sig ../wms/xie2.wm
+
+xie2install: xie2
+	$(CP) gen_xie2_sig$(EXE) wm_xie2_e$(EXE) wm_xie2_d$(EXE) cmp_xie2_sig$(EXE) $(INSTALLDIR)
+
+xie2man: gen_xie2_sig.ps wm_xie2_e.ps wm_xie2_d.ps
+
+wm_xie2_e$(EXE): wm_xie2_e$(O) $(LIBPREFIX)wm$(LIB) $(LIBPREFIX)wavelet$(LIB)
+	$(CC) $(LDFLAGS) -o $@ wm_xie2_e$(O) $(WMLIB) $(WAVELIB) $(LIBS) $(PGMLIBS)
+
+wm_xie2_d$(EXE): wm_xie2_d$(O) $(LIBPREFIX)wm$(LIB) $(LIBPREFIX)wavelet$(LIB)
+	$(CC) $(LDFLAGS) -o $@  wm_xie2_d$(O) $(WMLIB) $(WAVELIB) $(LIBS) $(PGMLIBS)
+
+gen_xie2_sig$(EXE): gen_xie2_sig$(O) wm$(O)
+	$(CC) $(LDFLAGS) -o $@ gen_xie2_sig$(O) wm$(O) $(LIBS)
+
+cmp_xie2_sig$(EXE): cmp_xie2_sig$(O) $(LIBPREFIX)wm$(LIB)
+	$(CC) $(LDFLAGS) -o $@ cmp_xie2_sig$(O) $(WMLIB) $(LIBS)
+
+xie2clean:
+	$(RM) gen_xie2_sig$(EXE) wm_xie2_e$(EXE) wm_xie2_d$(EXE) cmp_xie2_sig$(EXE)
+
+# Kundur's algorithm 2 (DWT, blind, binary, quantization, detail subbands, reference watermark)
+
+kund2: gen_kund2_sig$(EXE) wm_kund2_e$(EXE) wm_kund2_d$(EXE) cmp_kund2_sig$(EXE)
+
+kund2test: kund2
+	gen_kund2_sig$(EXE) -n 1000 -l 3 -q 2 gen_kund2_sig.c > ../sigs/kund2.sig
+	wm_kund2_e$(EXE) -s ../sigs/kund2.sig -o ../watermarked/kund2_lena.pgm ../images/lena.pgm
+	cjpeg -quality 70 ../watermarked/kund2_lena.pgm | djpeg | wm_kund2_d$(EXE) -s ../sigs/kund2.sig -o ../wms/kund2.wm
+	cmp_kund2_sig$(EXE) -s ../sigs/kund2.sig ../wms/kund2.wm
+
+kund2install: kund2
+	$(CP) gen_kund2_sig$(EXE) wm_kund2_e$(EXE) wm_kund2_d$(EXE) cmp_kund2_sig$(EXE) $(INSTALLDIR)
+
+kund2man: gen_kund2_sig.ps wm_kund2_e.ps wm_kund2_d.ps
+
+wm_kund2_e$(EXE): wm_kund2_e$(O) $(LIBPREFIX)wm$(LIB) $(LIBPREFIX)wavelet$(LIB)
+	$(CC) $(LDFLAGS) -o $@ wm_kund2_e$(O) $(WMLIB) $(WAVELIB) $(LIBS) $(PGMLIBS)
+
+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)
+
+cmp_kund2_sig$(EXE): cmp_kund2_sig$(O) $(LIBPREFIX)wm$(LIB)
+	$(CC) $(LDFLAGS) -o $@ cmp_kund2_sig$(O) $(WMLIB) $(LIBS)
+
+kund2clean:
+	$(RM) gen_kund2_sig$(EXE) wm_kund2_e$(EXE) wm_kund2_d$(EXE) cmp_kund2_sig$(EXE)
+
+# Kundur's algorithm 3 (DWT, blind, binary, quantization, detail subbands)
+
+kund3: gen_kund3_sig$(EXE) wm_kund3_e$(EXE) wm_kund3_d$(EXE) cmp_kund3_sig$(EXE)
+
+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 
+	cmp_kund3_sig$(EXE) -s ../sigs/kund3.sig ../wms/kund3.wm
+
+kund3install: kund3
+	$(CP) gen_kund3_sig$(EXE) wm_kund3_e$(EXE) wm_kund3_d$(EXE) cmp_kund3_sig$(EXE) $(INSTALLDIR)
+
+kund3man: gen_kund3_sig.ps wm_kund3_e.ps wm_kund3_d.ps
+
+wm_kund3_e$(EXE): wm_kund3_e$(O) $(LIBPREFIX)wm$(LIB) $(LIBPREFIX)wavelet$(LIB)
+	$(CC) $(LDFLAGS) -o $@ wm_kund3_e$(O) $(WMLIB) $(WAVELIB) $(LIBS) $(PGMLIBS)
+
+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)
+
+cmp_kund3_sig$(EXE): cmp_kund3_sig$(O) $(LIBPREFIX)wm$(LIB)
+	$(CC) $(LDFLAGS) -o $@ cmp_kund3_sig$(O) $(WMLIB) $(LIBS)
+
+kund3clean:
+	$(RM) gen_kund3_sig$(EXE) wm_kund3_e$(EXE) wm_kund3_d$(EXE) cmp_kund3_sig$(EXE)
+
 # Dugad's algorithm (DWT, blind)
 
 dugad: gen_dugad_sig$(EXE) wm_dugad_e$(EXE) wm_dugad_d$(EXE) cmp_dugad_sig$(EXE)
@@ -405,18 +500,18 @@
 
 
 
-clean:	coxclean bruynclean kochclean corviclean xiaclean zhuclean xieclean \
-	dugadclean kimclean wangclean frid2clean toolsclean libraryclean waveletclean
+clean:	coxclean bruynclean kochclean corviclean xiaclean zhuclean xieclean kund3clean kund2clean \
+	dugadclean kimclean wangclean frid2clean toolsclean libraryclean waveletclean xie2clean
 	$(RM) *$(O) *.ps ../sigs/* ../wms/* ../watermarked/* 
 	
 
 man:	coxman bruynman kochman corviman xiaman xieman toolsman
 
 test:	coxtest bruyntest kochtest corvitest xiatest xietest dugadtest zhutest \
-	wangtest frid2test kimtest toolstest
+	wangtest frid2test kimtest toolstest kund3test kund2test
 
 install: coxinstall bruyninstall kochinstall corviinstall xiainstall xieinstall \
-	dugadinstall zhuinstall wanginstall frid2install kiminstall toolsinstall
+	dugadinstall zhuinstall wanginstall frid2install kiminstall toolsinstall kund3install kund2install
 
 depend:
 	$(MAKEDEP) *.h *.c