diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-11-18 19:09:33 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-11-18 19:09:33 +0000 |
| commit | 7bba051550fc5cba5389c33e4399f9f2f90d1b4b (patch) | |
| tree | 25917b3fab9c394004e6c3cae303cf8b5a21a886 /converter/other | |
| parent | 5b60c74e9b463c68befa6ebdff6df13a47454d7f (diff) | |
| download | netpbm-mirror-7bba051550fc5cba5389c33e4399f9f2f90d1b4b.tar.gz netpbm-mirror-7bba051550fc5cba5389c33e4399f9f2f90d1b4b.tar.xz netpbm-mirror-7bba051550fc5cba5389c33e4399f9f2f90d1b4b.zip | |
Do backward compatibility names for merge build in the directories instead of in netpbm.c. Now works for programs that are built conditionally
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3436 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other')
| -rw-r--r-- | converter/other/Makefile | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/converter/other/Makefile b/converter/other/Makefile index 02774e81..2be88781 100644 --- a/converter/other/Makefile +++ b/converter/other/Makefile @@ -166,6 +166,8 @@ endif OBJECTS = $(BINARIES:%=%.o) $(EXTRA_OBJECTS) MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) $(EXTRA_OBJECTS) +HAVE_MERGE_COMPAT=YES + pnmtops.o pnmtops.o2: CFLAGS_TARGET=$(PNMTOPS_NOFLATE_OPT) SCRIPTS = anytopnm pnmtoplainpnm @@ -296,3 +298,25 @@ ifeq ($(HAVE_PNGLIB),Y) cd $(PKGDIR)/bin ; \ $(SYMLINK) pamtopng$(EXE) pamrgbatopng$(EXE) endif + +mergecomptrylist: + cat /dev/null >$@ + echo "TRY(\"bmptoppm\", main_bmptopnm);" >>$@ + echo "TRY(\"gemtopbm\", main_gemtopnm);" >>$@ +ifneq ($(JPEGLIB),NONE) + echo "TRY(\"ppmtojpeg\", main_pnmtojpeg);" >>$@ +endif + echo "TRY(\"ppmtouil\", main_pamtouil);" >>$@ + echo "TRY(\"ppmtotga\", main_pamtotga);" >>$@ + echo "TRY(\"pnmtopnm\", main_pamtopnm);" >>$@ + echo "TRY(\"pnmtofits\", main_pamtofits);" >>$@ +ifneq ($(TIFF_PREREQ_MISSING),Y) + echo "TRY(\"pnmtotiff\", main_pamtotiff);" >>$@ +endif +ifeq ($(HAVE_PNGLIB),Y) + echo "TRY(\"pngtopnm\", main_pngtopam);" >>$@ +endif + echo "TRY(\"icontopbm\", main_sunicontopnm);" >>$@ +ifeq ($(HAVE_PNGLIB),Y) + echo "TRY(\"pamrgbatopng\", main_pamtopng);" >>$@ +endif |