Join aftertime tools

diff --cc makefile
index 2f1aa7e8d0c5edca178a25822d44295e55d7ea9c,d644ed25a260f52909b0b97325fa33518db4363e..4dafd73f6e8d1c42f62223d3bdcd9783b0a973e0
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -1,40 -1,13 +1,51 @@@
- <<<<<<< HEAD
 -CC=gcc\r
 -CC2=g++\r
 -CF=-g -Wall\r
 -LF=-lIL\r
 -LF2=-lcgi\r
 +CC=g++
 +CF=-g -Wall
 +LF=-lIL
 +LF2=-lcgi
 +
- all: 403 npb npbd npb-ong1 npbd-ong1 bluenh bluenhd insert extract seediff insertframe
++all: 403 npb npbd npb-ong1 npbd-ong1 bluenh bluenhd insert extract seediff insertframe mremapt-1 compare nofading nofadingd
 +
 +npb: npb-ong1.cpp makefile
 +      $(CC) $(CF) $(LF) -o npb-ong1 npb-ong1.cpp
 +
 +npb: npb.cpp makefile
 +      $(CC) $(CF) $(LF) -o npb npb.cpp
 +
 +403: 403.cpp makefile
 +      $(CC) $(CF) $(LF) -o 403 403.cpp
 +
 +npbd-ong1: npb npbd-ong1.cpp makefile
 +      $(CC) $(CF) -o npbd-ong1 npbd-ong1.cpp $(LF2)
 +
 +npbd: npb npbd.cpp makefile
 +      $(CC) $(CF) -o npbd npbd.cpp $(LF2)
 +
 +bluenh: bluenh.cpp makefile
 +      $(CC) $(CF) $(LF) -o bluenh bluenh.cpp
 +
 +bluenhd: bluenhd.cpp makefile
 +      $(CC) $(CF) -o bluenhd bluenhd.cpp $(LF2)
  \r
 -all:  mremapt-1 compare\r
 +insert: insert.c makefile\r
 +      $(CC) $(CF) $(LF) -o insert insert.c\r
  \r
 -remapt-1: remapt-1.c makefile\r
 -      $(CC) $(CF) $(LF) -o remapt-1 remapt-1.c\r
 +extract: extract.c makefile\r
 +      $(CC) $(CF) $(LF) -o extract extract.c\r
  \r
 -compare: compare.c makefile\r
 -      $(CC) $(CF) $(LF) -o compare compare.c\r
 +seediff: seediff.c makefile\r
 +      $(CC) $(CF) $(LF) -o seediff seediff.c\r
 +\r
 +insertframe: insertframe.c makefile\r
 +      $(CC) $(CF) -o insertframe insertframe.c $(LF2)\r
++
++remapt-1: remapt-1.c makefile
++      $(CC) $(CF) $(LF) -o remapt-1 remapt-1.c
++
++compare: compare.c makefile
++      $(CC) $(CF) $(LF) -o compare compare.c
++
++nofading: nofading.c makefile
++      $(CC) $(CF) $(LF) -o nofading nofading.c
++
++nofadingd: nofadingd.c makefile
++      $(CC) $(CF) $(LF) -o nofadingd nofadingd.c