diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-03-27 01:38:28 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2016-03-27 01:38:28 +0000 |
| commit | 367c9cb514c9da766488b9bdb218a18e31cb7624 (patch) | |
| tree | f9e343be94161a4837f0f1c1d072a35538ae0f63 /converter/other/cameratopam/Makefile | |
| parent | 6e88e3326cb0c7f7975b56189278cab3f84ba1bd (diff) | |
| download | netpbm-mirror-367c9cb514c9da766488b9bdb218a18e31cb7624.tar.gz netpbm-mirror-367c9cb514c9da766488b9bdb218a18e31cb7624.tar.xz netpbm-mirror-367c9cb514c9da766488b9bdb218a18e31cb7624.zip | |
Promote Stable (10.47) to Super Stable
git-svn-id: http://svn.code.sf.net/p/netpbm/code/super_stable@2691 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/cameratopam/Makefile')
| -rw-r--r-- | converter/other/cameratopam/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/converter/other/cameratopam/Makefile b/converter/other/cameratopam/Makefile index b6778c67..20a95aa2 100644 --- a/converter/other/cameratopam/Makefile +++ b/converter/other/cameratopam/Makefile @@ -5,14 +5,15 @@ endif SUBDIR = converter/other/cameratopam VPATH=.:$(SRCDIR)/$(SUBDIR) +EXTERN_INCLUDES = ifneq ($(JPEGLIB),NONE) ifneq ($(JPEGHDR_DIR)x,x) - INCLUDES += -I$(JPEGHDR_DIR) + EXTERN_INCLUDES += -I$(JPEGHDR_DIR) CFLAGS += -DHAVE_JPEG endif endif -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk .PHONY: all @@ -27,7 +28,7 @@ BINARIES = cameratopam MERGEBINARIES = SCRIPTS = -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk cameratopam: $(OBJECTS) $(NETPBMLIB) $(LIBOPT) $(LD) -o $@ \ |