diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-29 16:32:28 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2018-12-29 16:32:28 +0000 |
commit | ee250e7490cbb3550fed22fdb98b7152cce20b72 (patch) | |
tree | 83fd278faf86341c5495567396e5abea2ec1a4a4 /other/Makefile | |
parent | ebf403d4015d30f19a37895efdce201300c9b418 (diff) | |
download | netpbm-mirror-ee250e7490cbb3550fed22fdb98b7152cce20b72.tar.gz netpbm-mirror-ee250e7490cbb3550fed22fdb98b7152cce20b72.tar.xz netpbm-mirror-ee250e7490cbb3550fed22fdb98b7152cce20b72.zip |
Promote current Development release as Advanced
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@3468 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'other/Makefile')
-rw-r--r-- | other/Makefile | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/other/Makefile b/other/Makefile index bd2c9dc2..aa0d75bb 100644 --- a/other/Makefile +++ b/other/Makefile @@ -45,6 +45,8 @@ OBJECTS = $(BINARIES:%=%.o) MERGEBINARIES = $(BINARIES) MERGE_OBJECTS = $(MERGEBINARIES:%=%.o2) +HAVE_MERGE_COMPAT=YES + .PHONY: all all: $(BINARIES) $(SUBDIRS:%=%/all) @@ -52,7 +54,7 @@ include $(SRCDIR)/common.mk ppmsvgalib: LDFLAGS_TARGET = $(shell $(LIBOPT) $(LINUXSVGALIB)) -install.bin: install.bin.local +install.bin install.merge: install.bin.local .PHONY: install.bin.local install.bin.local: $(PKGDIR)/bin # Remember that $(SYMLINK) might just be a copy command. @@ -69,4 +71,10 @@ install.bin.local: $(PKGDIR)/bin rm -f pnmdepth$(EXE) ; \ $(SYMLINK) pamdepth$(EXE) pnmdepth$(EXE) +mergecomptrylist: + cat /dev/null >$@ + echo "TRY(\"pnmarith\", main_pamarith);" >>$@ + echo "TRY(\"pnmsplit\", main_pamsplit);" >>$@ + echo "TRY(\"pnmdepth\", main_pamdepth);" >>$@ + FORCE: |