Add a bunch of legacy names to merge build

git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@2422 9d0c8265-081b-0410-96cb-a4ca84ce46f8

2 files changed, 46 insertions, 14 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 4be3c7c8..1e933347 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -354,14 +354,31 @@ netpbm.o: mergetrylist
 install.merge: local.install.merge
 .PHONY: local.install.merge
 local.install.merge:
-	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmnoraw
-	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm gemtopbm
-	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnminterp
-	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmoil
-	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm ppmtojpeg
 	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm bmptoppm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm gemtopbm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm icontopbm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmedge
 	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmnorm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmoil
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pgmslice
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pngtopnm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmarith
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmcomp
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmcut
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmdepth
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmenlarge
 	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmfile
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnminterp
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmnoraw
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmscale
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmsplit
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmtofits
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmnoraw
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmtopnm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm ppmnorm
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm ppmtojpeg
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmtotga
+	cd $(PKGDIR)/bin; $(SYMLINKEXE) netpbm pnmtouil
 
 ifneq ($(NETPBMLIBTYPE),unixstatic)
 install.lib: lib/install.lib
diff --git a/netpbm.c b/netpbm.c
index 716af766..f647ad15 100644
--- a/netpbm.c
+++ b/netpbm.c
@@ -56,26 +56,41 @@ main(int argc, char *argv[]) {
 #include "mergetrylist"
 
     /* Add the obsolete names for some programs */
+    TRY("bmptoppm", main_bmptopnm);
     TRY("gemtopbm", main_gemtopnm);
-    TRY("pnminterp", main_pamstretch);
+    TRY("icontopbm", main_sunicontopnm);
+    TRY("pbmtoicon", main_pbmtosunicon);
+    TRY("pgmedge", main_pamedge);
+    TRY("pgmnorm", main_pnmnorm);
     TRY("pgmoil", main_pamoil);
+    TRY("pgmslice", main_pamslice);
+    TRY("pnmarith", main_pamarith);
+    TRY("pngtopnm", main_pngtopam);
+    TRY("pnmarith", main_pamarith);
+    TRY("pnmcomp", main_pamcomp);
+    TRY("pnmcut", main_pamcut);
+    TRY("pnmdepth", main_pamdepth);
+    TRY("pnmfile", main_pamfile);
+    TRY("pnminterp", main_pamstretch);
+    TRY("pnmenlarge", main_pamenlarge);
+    TRY("pnmscale", main_pamscale);
+    TRY("pnmsplit", main_pamsplit);
+    TRY("pnmtofits", main_pamtofits);
+    TRY("pnmtopnm", main_pamtopnm);
+    TRY("ppmnorm", main_pnmnorm);
+    TRY("ppmtotga", main_pamtotga);
+    TRY("ppmtouil", main_pamtouil);
 
     /* We don't do the ppmtojpeg alias because if user doesn't have a JPEG
        library, there is no main_pnmtojpeg library.  The right way to do
        this is to have these TRY's generated by the subdirectory makes,
        which would know whether pnmtojpeg was built into the merged binary
-       or not.  But that's too much work.
+       or not.  But that's too much work.  Same with TIFF converters.
 
     TRY("ppmtojpeg", main_pnmtojpeg); 
     TRY("pngtopnm", main_pngtopam); 
+    TRY("pnmtotiff", main_pamtotiff);
     */
-    TRY("bmptoppm", main_bmptopnm);
-    TRY("pgmnorm", main_pnmnorm);
-    TRY("ppmnorm", main_pnmnorm);
-    TRY("ppmtotga", main_pamtotga);
-    TRY("pnmarith", main_pamarith);
-    TRY("pnmfile", main_pamfile);
-    TRY("pgmedge", main_pamedge);
 
     fprintf(stderr,"'%s' is an unknown Netpbm program name \n", cp );
     exit(1);