diff options
Diffstat (limited to 'converter/other/pnmtopalm')
| -rw-r--r-- | converter/other/pnmtopalm/Makefile | 16 | ||||
| -rw-r--r-- | converter/other/pnmtopalm/gen_palm_colormap.c | 4 |
2 files changed, 14 insertions, 6 deletions
diff --git a/converter/other/pnmtopalm/Makefile b/converter/other/pnmtopalm/Makefile index edc7da64..65790002 100644 --- a/converter/other/pnmtopalm/Makefile +++ b/converter/other/pnmtopalm/Makefile @@ -8,10 +8,8 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) include $(BUILDDIR)/config.mk BINARIES = palmtopnm pnmtopalm -PORTBINARIES = $(BINARIES) gen_palm_colormap SCRIPTS = -ADDL_OBJECTS = palmcolormap.o -OBJECTS = $(BINARIES:%=%.o) $(ADDL_OBJECTS) gen_palm_colormap.o +OBJECTS = $(BINARIES:%=%.o) palmcolormap.o MERGE_OBJECTS = $(BINARIES:%=%.o2) palmcolormap.o MERGEBINARIES = $(BINARIES) DATAFILES = palmcolor8.map palmgray1.map palmgray2.map palmgray4.map @@ -20,7 +18,17 @@ all: $(BINARIES) include $(SRCDIR)/common.mk -$(BINARIES): $(ADDL_OBJECTS) +LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB)) + +$(BINARIES): %: %.o palmcolormap.o $(NETPBMLIB) $(LIBOPT) + $(LD) -o $@ $< palmcolormap.o $(LIBOPTS) \ + $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(RPATH) $(LADD) + +gen_palm_colormap : % : %.c palmcolormap.o + $(CC) -I importinc $(CFLAGS_ALL) -o $@ \ + $< palmcolormap.o \ + $(LIBOPTS) $(MATHLIB) $(LDFLAGS) $(LDLIBS) $(LADD) + clean: cleanspecial .PHONY: cleanspecial diff --git a/converter/other/pnmtopalm/gen_palm_colormap.c b/converter/other/pnmtopalm/gen_palm_colormap.c index 0f3f8a5f..c7172c6b 100644 --- a/converter/other/pnmtopalm/gen_palm_colormap.c +++ b/converter/other/pnmtopalm/gen_palm_colormap.c @@ -3,8 +3,8 @@ * Based on an earlier version by Bill Janssen <bill@janssen.org> */ -#include "netpbm/ppm.h" -#include "netpbm/pm_c_util.h" +#include "ppm.h" +#include "pm_c_util.h" #include "palm.h" |