Join frame inserting / hiding / revealing tool

diff --cc makefile
index 86aeda690189da6d783f656cd1eee68e67eb8495,4568ed0c69bcde6d96653dcffb3edafae7b06840..2f1aa7e8d0c5edca178a25822d44295e55d7ea9c
--- 1/makefile
--- 2/makefile
+++ b/makefile
@@@ -1,27 -1,18 +1,40 @@@
 -CC=gcc\r
 -CF=-g -Wall\r
 -LF=-lIL\r
 -LF2=-lcgi\r
 -\r
 -all: insert extract seediff insertframe\r
++<<<<<<< HEAD
 +CC=g++
 +CF=-g -Wall
 +LF=-lIL
 +LF2=-lcgi
 +
- all: 403 npb npbd npb-ong1 npbd-ong1 bluenh bluenhd
++all: 403 npb npbd npb-ong1 npbd-ong1 bluenh bluenhd insert extract seediff insertframe
 +
 +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
+ insert: insert.c makefile\r
+       $(CC) $(CF) $(LF) -o insert insert.c\r
+ \r
+ extract: extract.c makefile\r
+       $(CC) $(CF) $(LF) -o extract extract.c\r
+ \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