diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-12-26 06:13:41 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2013-12-26 06:13:41 +0000 |
| commit | 51ffbae51ba9379bad460566cdf9babaa63b14c3 (patch) | |
| tree | 441f6e9297c478261bdce544497decaf6abc31a4 /converter/other/cameratopam | |
| parent | d6f45222d7b29adb9defdd79dd8ad1dbc97bb3e1 (diff) | |
| download | netpbm-mirror-51ffbae51ba9379bad460566cdf9babaa63b14c3.tar.gz netpbm-mirror-51ffbae51ba9379bad460566cdf9babaa63b14c3.tar.xz netpbm-mirror-51ffbae51ba9379bad460566cdf9babaa63b14c3.zip | |
Update to current Development release - 10.65.00
git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@2083 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/cameratopam')
| -rw-r--r-- | converter/other/cameratopam/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/converter/other/cameratopam/Makefile b/converter/other/cameratopam/Makefile index 20a95aa2..4470d472 100644 --- a/converter/other/cameratopam/Makefile +++ b/converter/other/cameratopam/Makefile @@ -9,7 +9,7 @@ EXTERN_INCLUDES = ifneq ($(JPEGLIB),NONE) ifneq ($(JPEGHDR_DIR)x,x) EXTERN_INCLUDES += -I$(JPEGHDR_DIR) - CFLAGS += -DHAVE_JPEG + HAVE_JPEG_DEFINE = -DHAVE_JPEG endif endif @@ -22,6 +22,8 @@ all: cameratopam OBJECTS = util.o identify.o cameratopam.o camera.o foveon.o decode.o \ canon.o ljpeg.o dng.o +camera.o camera.o2: CFLAGS_TARGET = $(HAVE_JPEG_DEFINE) + MERGE_OBJECTS = BINARIES = cameratopam |