diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:32:13 +0000 |
| commit | 51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800 (patch) | |
| tree | 3b763ebf105fc1136ebcac13b7d4dafca114be68 /converter/other/pnmtopalm/Makefile | |
| parent | 1610a1f6aa54ad1d97926c1d8605720933059df7 (diff) | |
| download | netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.gz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.tar.xz netpbm-mirror-51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800.zip | |
Reverse messed up commit
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2222 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/pnmtopalm/Makefile')
| -rw-r--r-- | converter/other/pnmtopalm/Makefile | 16 |
1 files changed, 12 insertions, 4 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 |