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 /config.mk.in | |
| 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 'config.mk.in')
| -rw-r--r-- | config.mk.in | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/config.mk.in b/config.mk.in index 35d77bb4..7760bfb5 100644 --- a/config.mk.in +++ b/config.mk.in @@ -468,8 +468,8 @@ ZHDR_DIR = # The JBIG lossless image compression library (aka JBIG-KIT): -JBIGLIB = $(INTERNAL_JBIG_LIB) -JBIGHDR_DIR = $(INTERNAL_JBIGHDR_DIR) +JBIGLIB = $(BUILDDIR)/converter/other/jbig/libjbig.a +JBIGHDR_DIR = $(SRCDIR)/converter/other/jbig # The Jasper JPEG-2000 image compression library (aka JasPer): JASPERLIB = $(INTERNAL_JASPERLIB) @@ -503,11 +503,6 @@ LINUXSVGAHDR_DIR = #LINUXSVGALIB = /usr/lib/libvga.so #LINUXSVGAHDR_DIR = /usr/include/vgalib -# WINICON_OBJECT is the object file to bind into all Netpbm executables -# to provide the icon for Windows to use for it. Null for none. -WINICON_OBJECT = -#WINICON_OBJECT = $(BUILDDIR)/icon/netpbm.o - # If you don't want any network functions, set OMIT_NETWORK to "Y". # The only thing that requires network functions is the option in # ppmtompeg to run it on multiple computers simultaneously. On some |