diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-09-27 21:44:29 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2009-09-27 21:44:29 +0000 |
| commit | 43939e66b1d4eeb2f3799c124f3598756755005a (patch) | |
| tree | 15733092de55d52421a6ea02f5a43d5f8ff24393 /converter/other/jpeg2000/Makefile | |
| parent | 49f4336c9bba33650573ba780b70bc501b38643e (diff) | |
| download | netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.tar.gz netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.tar.xz netpbm-mirror-43939e66b1d4eeb2f3799c124f3598756755005a.zip | |
Rebase Stable series to current Advanced: 10.47.04
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@995 9d0c8265-081b-0410-96cb-a4ca84ce46f8
Diffstat (limited to 'converter/other/jpeg2000/Makefile')
| -rw-r--r-- | converter/other/jpeg2000/Makefile | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile index bf3f5e4a..f4fee87f 100644 --- a/converter/other/jpeg2000/Makefile +++ b/converter/other/jpeg2000/Makefile @@ -7,11 +7,11 @@ VPATH=.:$(SRCDIR)/$(SUBDIR) SUBDIRS = libjasper -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk -INCLUDES = +EXTERN_INCLUDES = ifneq ($(JASPERHDR_DIR),NONE) - INCLUDES += -I$(JASPERHDR_DIR) + EXTERN_INCLUDES += -I$(JASPERHDR_DIR) endif @@ -55,7 +55,7 @@ MERGEBINARIES = $(BINARIES) .PHONY: all all: $(BINARIES) -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk LIBOPTS = $(shell $(LIBOPT) $(NETPBMLIB) $(JASPERLIB_USE)) |