diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:43:45 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2014-06-29 19:43:45 +0000 |
commit | fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad (patch) | |
tree | 798e7e0a8fc53429b26d536ecb6ec1a176923ded /converter/other/cameratopam/Makefile | |
parent | 51eb5e0d2722f0cf1033ac158d2fdbcd82b6e800 (diff) | |
download | netpbm-mirror-fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad.tar.gz netpbm-mirror-fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad.tar.xz netpbm-mirror-fcd1b680c260b931cb5b8cd900c88d9e8dd5f1ad.zip |
Fix up commit mess
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2223 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/cameratopam/Makefile')
-rw-r--r-- | converter/other/cameratopam/Makefile | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/converter/other/cameratopam/Makefile b/converter/other/cameratopam/Makefile index 4470d472..11ca4e1d 100644 --- a/converter/other/cameratopam/Makefile +++ b/converter/other/cameratopam/Makefile @@ -19,22 +19,20 @@ include $(BUILDDIR)/config.mk .PHONY: all all: cameratopam -OBJECTS = util.o identify.o cameratopam.o camera.o foveon.o decode.o \ +ADDL_OBJECTS = util.o identify.o camera.o foveon.o decode.o \ canon.o ljpeg.o dng.o +OBJECTS = cameratopam.o $(ADDL_OBJECTS) + camera.o camera.o2: CFLAGS_TARGET = $(HAVE_JPEG_DEFINE) MERGE_OBJECTS = -BINARIES = cameratopam +PORTBINARIES = cameratopam +BINARIES = $(PORTBINARIES) MERGEBINARIES = SCRIPTS = include $(SRCDIR)/common.mk -cameratopam: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) - $(LD) -o $@ \ - $(OBJECTS) $(shell $(LIBOPT) $(NETPBMLIB) $(LIBOPTR)) \ - $(MATHLIB) $(LDFLAGS) $(LDLIBS) \ - $(RPATH) $(LADD) - +cameratopam: $(ADDL_OBJECTS) |