Move stuff into new editor/specialty/ directory

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

18 files changed, 67 insertions, 16 deletions

diff --git a/editor/Makefile b/editor/Makefile
index 6e311e3e..931237b2 100644
--- a/editor/Makefile
+++ b/editor/Makefile
@@ -7,6 +7,8 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
 
 include $(BUILDDIR)/config.mk
 
+SUBDIRS = specialty
+
 # We tend to separate out the build targets so that we don't have
 # any more dependencies for a given target than it really needs.
 # That way, if there is a problem with a dependency, we can still
@@ -15,24 +17,23 @@ include $(BUILDDIR)/config.mk
 # build.
 
 PORTBINARIES = pamaddnoise pambackground pamcomp pamcut \
-	       pamdeinterlace pamdice pamditherbw pamedge \
+	       pamdice pamditherbw pamedge \
 	       pamenlarge \
-	       pamflip pamfunc pammasksharpen pammixinterlace \
-	       pamoil pamperspective pampop9 \
+	       pamflip pamfunc pammasksharpen \
+	       pamperspective \
 	       pamscale pamstretch pamthreshold pamundice \
-	       pbmclean pbmlife pbmmask pbmpscale pbmreduce \
-	       pgmabel pgmbentley pgmdeshadow pgmenhance \
-	       pgmmedian pgmmorphconv \
+	       pbmclean pbmmask pbmpscale pbmreduce \
+	       pgmdeshadow pgmenhance \
+	       pgmmedian \
 	       pnmalias pnmcat pnmcomp pnmconvol pnmcrop \
 	       pnmgamma \
-	       pnmhisteq pnmindex pnminvert pnmmontage \
+	       pnmhisteq pnminvert pnmmontage \
 	       pnmnlfilt pnmnorm pnmpad pnmpaste \
 	       pnmremap pnmrotate \
 	       pnmscale pnmscalefixed pnmshear pnmsmooth pnmstitch pnmtile \
-	       ppm3d ppmbrighten ppmchange ppmcolormask \
+	       ppmbrighten ppmchange ppmcolormask \
 	       ppmdim ppmdist ppmdither ppmdraw \
-	       ppmflash ppmglobe ppmlabel ppmmix \
-	       ppmntsc ppmrelief ppmshift ppmspread ppmtv
+	       ppmflash ppmlabel ppmmix \
 
 # We don't include programs that have special library dependencies in the
 # merge scheme, because we don't want those dependencies to prevent us
@@ -51,7 +52,7 @@ OBJECTS = $(BINARIES:%=%.o)
 MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2)
 
 .PHONY: all
-all: $(BINARIES)
+all: $(BINARIES) $(SUBDIRS:%=%/all)
 
 include $(SRCDIR)/common.mk
 
@@ -60,15 +61,10 @@ install.bin: install.bin.local
 .PHONY: install.bin.local
 install.bin.local: $(PKGDIR)/bin
 # Remember that $(SYMLINK) might just be a copy command.
-# backward compatibility: program used to be named pnmnoraw
 # backward compatibility: program used to be pnminterp
 	cd $(PKGDIR)/bin ; \
 	rm -f pnminterp; \
 	$(SYMLINK) pamstretch$(EXE) pnminterp
-# pamoil replaced pgmoil in June 2001.
-	cd $(PKGDIR)/bin ; \
-	rm -f pgmoil ; \
-	$(SYMLINK) pamoil$(EXE) pgmoil
 # In March 2002, pnmnorm replaced ppmnorm and pgmnorm
 	cd $(PKGDIR)/bin ; \
 	rm -f ppmnorm ; \
diff --git a/editor/specialty/Makefile b/editor/specialty/Makefile
new file mode 100644
index 00000000..eda54882
--- /dev/null
+++ b/editor/specialty/Makefile
@@ -0,0 +1,55 @@
+ifeq ($(SRCDIR)x,x)
+  SRCDIR = $(CURDIR)/../..
+  BUILDDIR = $(SRCDIR)
+endif
+SUBDIR = editor/specialty
+VPATH=.:$(SRCDIR)/$(SUBDIR)
+
+include $(BUILDDIR)/config.mk
+
+PORTBINARIES = pamdeinterlace \
+	       pammixinterlace \
+	       pamoil \
+	       pampop9 \
+	       pbmlife \
+	       pgmabel \
+	       pgmbentley \
+	       pgmmorphconv \
+	       pnmindex \
+	       ppm3d \
+	       ppmglobe \
+	       ppmntsc \
+	       ppmrelief \
+	       ppmshift \
+	       ppmspread \
+	       ppmtv \
+
+# We don't include programs that have special library dependencies in the
+# merge scheme, because we don't want those dependencies to prevent us
+# from building all the other programs.
+
+NOMERGEBINARIES = 
+MERGEBINARIES = $(PORTBINARIES)
+
+
+BINARIES = $(MERGEBINARIES) $(NOMERGEBINARIES)
+SCRIPTS =
+
+OBJECTS = $(BINARIES:%=%.o)
+
+MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2)
+
+.PHONY: all
+all: $(BINARIES)
+
+include $(SRCDIR)/common.mk
+
+install.bin: install.bin.local
+
+.PHONY: install.bin.local
+install.bin.local: $(PKGDIR)/bin
+# Remember that $(SYMLINK) might just be a copy command.
+# pamoil replaced pgmoil in June 2001.
+	cd $(PKGDIR)/bin ; \
+	rm -f pgmoil ; \
+	$(SYMLINK) pamoil$(EXE) pgmoil
diff --git a/editor/pamdeinterlace.c b/editor/specialty/pamdeinterlace.c
index 9ed1d8eb..9ed1d8eb 100644
--- a/editor/pamdeinterlace.c
+++ b/editor/specialty/pamdeinterlace.c
diff --git a/editor/pammixinterlace.c b/editor/specialty/pammixinterlace.c
index f22563f6..f22563f6 100644
--- a/editor/pammixinterlace.c
+++ b/editor/specialty/pammixinterlace.c
diff --git a/editor/pamoil.c b/editor/specialty/pamoil.c
index 6cb8d3ac..6cb8d3ac 100644
--- a/editor/pamoil.c
+++ b/editor/specialty/pamoil.c
diff --git a/editor/pampop9.c b/editor/specialty/pampop9.c
index d6c61e4f..d6c61e4f 100644
--- a/editor/pampop9.c
+++ b/editor/specialty/pampop9.c
diff --git a/editor/pbmlife.c b/editor/specialty/pbmlife.c
index be34cc69..be34cc69 100644
--- a/editor/pbmlife.c
+++ b/editor/specialty/pbmlife.c
diff --git a/editor/pgmabel.c b/editor/specialty/pgmabel.c
index 4914c4be..4914c4be 100644
--- a/editor/pgmabel.c
+++ b/editor/specialty/pgmabel.c
diff --git a/editor/pgmbentley.c b/editor/specialty/pgmbentley.c
index aed92074..aed92074 100644
--- a/editor/pgmbentley.c
+++ b/editor/specialty/pgmbentley.c
diff --git a/editor/pgmmorphconv.c b/editor/specialty/pgmmorphconv.c
index abc4e718..abc4e718 100644
--- a/editor/pgmmorphconv.c
+++ b/editor/specialty/pgmmorphconv.c
diff --git a/editor/pnmindex.c b/editor/specialty/pnmindex.c
index 7b405ef3..7b405ef3 100644
--- a/editor/pnmindex.c
+++ b/editor/specialty/pnmindex.c
diff --git a/editor/ppm3d.c b/editor/specialty/ppm3d.c
index 6f317a0b..6f317a0b 100644
--- a/editor/ppm3d.c
+++ b/editor/specialty/ppm3d.c
diff --git a/editor/ppmglobe.c b/editor/specialty/ppmglobe.c
index ee1a57c3..ee1a57c3 100644
--- a/editor/ppmglobe.c
+++ b/editor/specialty/ppmglobe.c
diff --git a/editor/ppmntsc.c b/editor/specialty/ppmntsc.c
index b9f2ac2f..b9f2ac2f 100644
--- a/editor/ppmntsc.c
+++ b/editor/specialty/ppmntsc.c
diff --git a/editor/ppmrelief.c b/editor/specialty/ppmrelief.c
index 5e0669c3..5e0669c3 100644
--- a/editor/ppmrelief.c
+++ b/editor/specialty/ppmrelief.c
diff --git a/editor/ppmshift.c b/editor/specialty/ppmshift.c
index a765daa5..a765daa5 100644
--- a/editor/ppmshift.c
+++ b/editor/specialty/ppmshift.c
diff --git a/editor/ppmspread.c b/editor/specialty/ppmspread.c
index 6753f4fe..6753f4fe 100644
--- a/editor/ppmspread.c
+++ b/editor/specialty/ppmspread.c
diff --git a/editor/ppmtv.c b/editor/specialty/ppmtv.c
index da25102a..da25102a 100644
--- a/editor/ppmtv.c
+++ b/editor/specialty/ppmtv.c