Release 10.36.1

git-svn-id: http://svn.code.sf.net/p/netpbm/code/advanced@72 9d0c8265-081b-0410-96cb-a4ca84ce46f8

7 files changed, 37 insertions, 35 deletions

diff --git a/GNUmakefile b/GNUmakefile
index 420d558c..0f5c04fd 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -102,13 +102,13 @@ TYPEGEN = $(BUILDDIR)/buildtools/typegen
 # endiangen is a utility program used by the make file below.
 ENDIANGEN = $(BUILDDIR)/buildtools/endiangen
 
-$(TYPEGEN): $(BUILDDIR)/buildtools
+$(TYPEGEN) $(ENDIANGEN): $(BUILDDIR)/buildtools
 	$(MAKE) -C $(dir $@) -f $(SRCDIR)/buildtools/Makefile \
 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@) 
 
 DELETEIT = (rm -f $@ || false)
 
-$(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN)
+inttypes_netpbm.h: $(TYPEGEN)
 	$(TYPEGEN) >$@ || $(DELETEIT)
 
 # We run a couple of programs on the build machine in computing the
@@ -116,7 +116,7 @@ $(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN)
 # that or to override the results, because it doesn't work if he's
 # cross compiling.
 
-$(BUILDDIR)/pm_config.h: \
+pm_config.h: \
   $(SRCDIR)/pm_config.in.h Makefile.config inttypes_netpbm.h \
   $(ENDIANGEN)
 	echo '/* pm_config.h GENERATED BY A MAKE RULE */' >$@ || $(DELETEIT)
@@ -145,7 +145,7 @@ endif
 MAJOR := $(NETPBM_MAJOR_RELEASE)
 MINOR := $(NETPBM_MINOR_RELEASE)
 POINT := $(NETPBM_POINT_RELEASE)
-$(BUILDDIR)/version.h:
+version.h:
 	@rm -f $@
 	@echo "/* Generated by make file rule */" >$@
 	@echo "#define NETPBM_VERSION" \
@@ -350,7 +350,7 @@ install.hdr: $(PKGDIR)/include
 	$(MAKE) -C lib -f $(SRCDIR)/lib/Makefile \
 	    SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) install.hdr
 	$(INSTALL) -c -m $(INSTALL_PERM_HDR) \
-	    $(SRCDIR)/pm_config.h $(PKGDIR)/include
+	    $(BUILDDIR)/pm_config.h $(PKGDIR)/include
 
 ifeq ($(STATICLIB_TOO),y)
 BUILD_STATIC = y
diff --git a/Makefile.version b/Makefile.version
index a524892c..c6cb3b01 100644
--- a/Makefile.version
+++ b/Makefile.version
@@ -1,4 +1,4 @@
 NETPBM_MAJOR_RELEASE = 10
 NETPBM_MINOR_RELEASE = 36
-NETPBM_POINT_RELEASE = 0
+NETPBM_POINT_RELEASE = 1
 
diff --git a/converter/other/jpeg2000/Makefile b/converter/other/jpeg2000/Makefile
index c5e74361..92225818 100644
--- a/converter/other/jpeg2000/Makefile
+++ b/converter/other/jpeg2000/Makefile
@@ -18,7 +18,7 @@ endif
 # INTERNAL_JASPERLIB must be relative to the current directory, because it
 # may end up in MERGE_OBJECTS, which must be relative.
 INTERNAL_JASPERLIB = libjasper/libjasper.a
-INTERNAL_JASPERHDR_DIR = libjasper/include
+INTERNAL_JASPERHDR_DIR = $(SRCDIR)/$(SUBDIR)/libjasper/include
 
 ifeq ($(JASPERLIB),$(INTERNAL_JASPERLIB))
   ifeq ($(HAVE_INT64),Y)
@@ -63,15 +63,9 @@ $(BINARIES): %: %.o $(JASPERLIB_DEP) $(NETPBMLIB) $(LIBOPT)
 	$(LD) $(LDFLAGS) $(MATHLIB) $(LDLIBS) -o $@ $< \
 	  $(LIBOPTS) $(JASPERDEPLIBS) -lm $(RPATH) $(LADD)
 
-$(INTERNAL_JASPERLIB): FORCE
+$(INTERNAL_JASPERLIB): $(BUILDDIR)/$(SUBDIR)/libjasper FORCE
 	$(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile \
 	   -C $(dir $@) $(notdir $@)
 
-clean: localclean
-
-.PHONY: localclean
-localclean:
-	$(MAKE) -f $(SRCDIR)/$(SUBDIR)/libjasper/Makefile -C libjasper clean
-
 .PHONY: FORCE
 FORCE:
diff --git a/converter/other/jpeg2000/libjasper/Makefile b/converter/other/jpeg2000/libjasper/Makefile
index 73d263ec..ad4fbd8f 100644
--- a/converter/other/jpeg2000/libjasper/Makefile
+++ b/converter/other/jpeg2000/libjasper/Makefile
@@ -8,6 +8,8 @@ VPATH=.:$(SRCDIR)/$(SUBDIR)
 include $(BUILDDIR)/Makefile.config
 
 SUBDIRS = base jp2 jpc
+LIB_OBJECTS =
+JASPERSRCDIR = $(SRCDIR)/$(SUBDIR)
 
 # NOTE: The library source code uses 64 bit types, so you cannot
 # build it (compile will fail) if you don't have 64 bit types defined
diff --git a/converter/other/jpeg2000/libjasper/Makefile.common b/converter/other/jpeg2000/libjasper/Makefile.common
index 84781769..7737f2c0 100644
--- a/converter/other/jpeg2000/libjasper/Makefile.common
+++ b/converter/other/jpeg2000/libjasper/Makefile.common
@@ -1,10 +1,12 @@
 # -*-makefile-*-    <-- an Emacs control
-# This is common rules for the pnmtojpc subdirectories.
+# This is common rules for the libjasper subdirectories.
 #
 # Set the following variables before including this:
 #
-#  LIB_OBJECTS: List of object files from this directory that go into 
-#               libjasper.
+#  SUBDIRS:      Subdirectory names
+#  LIB_OBJECTS:  List of object files from this directory that go into 
+#                libjasper.
+#  JASPERSRCDIR: libjasper source directory
 
 all: $(LIB_OBJECTS) partlist
 
@@ -19,19 +21,16 @@ $(SUBDIRS:%=%/partlist): %/partlist: $(CURDIR)/%
 
 include $(SRCDIR)/Makefile.common
 
-INCLUDES = -I$(JASPERSRCDIR)/include -I$(JASPERSRCDIR)/importinc
+INCLUDES = -I$(JASPERSRCDIR)/include -Iimportinc
 
 DEFS = -DHAVE_LIBM=1 -DSTDC_HEADERS=1 -DHAVE_FCNTL_H=1 -DHAVE_LIMITS_H=1 -DHAVE_UNISTD_H=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STDDEF_H=1 -DEXCLUDE_BMP_SUPPORT -DEXCLUDE_RAS_SUPPORT -DEXCLUDE_MIF_SUPPORT -DEXCLUDE_JPG_SUPPORT -DEXCLUDE_PGX_SUPPORT -DEXCLUDE_PNM_SUPPORT
 
 $(LIB_OBJECTS):%.o:%.c
 	$(CC) -c $(CFLAGS) $(INCLUDES) $(DEFS) $(CADD) $<
 
-$(LIB_OBJECTS): $(JASPERSRCDIR)/importinc
+$(LIB_OBJECTS): importinc
 
-$(JASPERSRCDIR)/importinc:
-	$(MAKE) -C $(dir $@) $(notdir $@)
-
-clean: localclean
+thisdirclean: localclean
 
 .PHONY: localclean
 localclean:
diff --git a/doc/HISTORY b/doc/HISTORY
index 64c0e95b..20058106 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -4,6 +4,12 @@ Netpbm.
 CHANGE HISTORY 
 --------------
 
+06.09.29 BJH  Release 10.36.1
+
+              Build: fix build with separate build directory.
+
+              Build: fix merge build with no X11 library.
+
 06.09.21 BJH  Release 10.36.0
 
               pbmtonokia: Add plain NPM output capability.  Thanks Paul Bolle
diff --git a/other/pamx/Makefile b/other/pamx/Makefile
index 8aab2608..9ad8860d 100644
--- a/other/pamx/Makefile
+++ b/other/pamx/Makefile
@@ -16,19 +16,20 @@ endif
 
 ifneq ($(X11LIB),NONE)
   BINARIES += pamx
-endif
 
-PAMX_OBJECTS = \
-	pamx.o \
-	image.o \
-	send.o \
-	window.o \
-
-MERGE_OBJECTS = \
-	pamx.o2 \
-	image.o \
-	send.o \
-	window.o \
+  PAMX_OBJECTS = \
+	  pamx.o \
+	  image.o \
+	  send.o \
+	  window.o \
+
+  MERGE_OBJECTS = \
+	  pamx.o2 \
+	  image.o \
+	  send.o \
+	  window.o \
+
+endif
 
 OBJECTS = $(PAMX_OBJECTS)