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 /editor | |
| 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 'editor')
| -rw-r--r-- | editor/Makefile | 14 | ||||
| -rw-r--r-- | editor/specialty/Makefile | 6 |
2 files changed, 20 insertions, 0 deletions
diff --git a/editor/Makefile b/editor/Makefile index 490900dd..de5ae666 100644 --- a/editor/Makefile +++ b/editor/Makefile @@ -51,6 +51,8 @@ OBJECTS = $(BINARIES:%=%.o) MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) +HAVE_MERGE_COMPAT=YES + .PHONY: all all: $(BINARIES) $(SUBDIRS:%=%/all) @@ -98,3 +100,15 @@ install.bin.local: $(PKGDIR)/bin cd $(PKGDIR)/bin ; \ rm -f pnmcomp$(EXE) ; \ $(SYMLINK) pamcomp$(EXE) pnmcomp$(EXE) + +mergecomptrylist: + cat /dev/null >$@ + echo "TRY(\"pnminterp\", main_pamstretch);" >>$@ + echo "TRY(\"pgmnorm\", main_pnmnorm);" >>$@ + echo "TRY(\"ppmnorm\", main_pnmnorm);" >>$@ + echo "TRY(\"pgmedge\", main_pamedge);" >>$@ + echo "TRY(\"pnmenlarge\", main_pamenlarge);" >>$@ + echo "TRY(\"pnmcut\", main_pamcut);" >>$@ + echo "TRY(\"pnmscale\", main_pamscale);" >>$@ + echo "TRY(\"pnmcomp\", main_pamcomp);" >>$@ + diff --git a/editor/specialty/Makefile b/editor/specialty/Makefile index 0599cf72..8d9ca044 100644 --- a/editor/specialty/Makefile +++ b/editor/specialty/Makefile @@ -41,6 +41,8 @@ OBJECTS = $(BINARIES:%=%.o) MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) +HAVE_MERGE_COMPAT=YES + .PHONY: all all: $(BINARIES) @@ -55,3 +57,7 @@ install.bin.local: $(PKGDIR)/bin cd $(PKGDIR)/bin ; \ rm -f pgmoil$(EXE) ; \ $(SYMLINK) pamoil$(EXE) pgmoil$(EXE) + +mergecomptrylist: + cat /dev/null >$@ + echo "TRY(\"pgmoil\", main_pamoil);" >>$@ |