diff options
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: |