Attachment #80995 for bug #116665

Lines 89-94 Link Here

(-)netpbm-10.32/GNUmakefile (-1 / +2 lines)
89		89
90	OMIT_CONFIG_RULE = 1	90	OMIT_CONFIG_RULE = 1
91	OMIT_VERSION_H_RULE = 1	91	OMIT_VERSION_H_RULE = 1
		92	OMIT_INTTYPES_RULE = 1
92	include $(SRCDIR)/Makefile.common	93	include $(SRCDIR)/Makefile.common
93		94
94	$(BUILDDIR)/Makefile.config: $(SRCDIR)/Makefile.config.in	95	$(BUILDDIR)/Makefile.config: $(SRCDIR)/Makefile.config.in
Lines 107-113 Link Here
107		108
108	DELETEIT = (rm -f $@ \|\| false)	109	DELETEIT = (rm -f $@ \|\| false)
109		110
110	inttypes_netpbm.h: $(TYPEGEN)	111	$(BUILDDIR)/inttypes_netpbm.h: $(TYPEGEN)
111	$(TYPEGEN) >$@ \|\| $(DELETEIT)	112	$(TYPEGEN) >$@ \|\| $(DELETEIT)
112		113
113	# We run a couple of programs on the build machine in computing the	114	# We run a couple of programs on the build machine in computing the

Lines 129-141 Link Here

(-)netpbm-10.32/Makefile.common (-4 / +7 lines)
129	$(IMPORTINC_LIB_FILES) \	129	$(IMPORTINC_LIB_FILES) \
130	$(IMPORTINC_LIB_UTIL_FILES) \	130	$(IMPORTINC_LIB_UTIL_FILES) \
131		131
132	$(IMPORTINC_ROOT_FILES):importinc/%:$(SRCDIR)/%	132	$(IMPORTINC_ROOT_FILES):importinc/%:$(BUILDDIR)/%
133	mkdir -p importinc	133	mkdir -p importinc
134	rm -f $@	134	rm -f $@
135	$(SYMLINK) $< $@	135	$(SYMLINK) $< $@
136		136
137	importinc/pm_config.h: $(BUILDDIR)/pm_config.h
138
139	$(IMPORTINC_LIB_FILES):importinc/%:$(SRCDIR)/lib/%	137	$(IMPORTINC_LIB_FILES):importinc/%:$(SRCDIR)/lib/%
140	mkdir -p importinc	138	mkdir -p importinc
141	rm -f $@	139	rm -f $@
Lines 168-173 Link Here
168	$(MAKE) -C $(dir $@) $(notdir $@)	166	$(MAKE) -C $(dir $@) $(notdir $@)
169	endif	167	endif
170		168
		169	ifneq ($(OMIT_INTTYPES_RULE),1)
		170	$(BUILDDIR)/inttypes_netpbm.h:
		171	$(MAKE) -C $(dir $@) -f $(SRCDIR)/GNUmakefile $(notdir $@)
		172	endif
		173
171	# Note that any time you do a make on a fresh Netpbm source tree,	174	# Note that any time you do a make on a fresh Netpbm source tree,
172	# Make notices that 'Makefile.config', which the make files include, does not	175	# Make notices that 'Makefile.config', which the make files include, does not
173	# exist and runs the "Makefile.config" target, which runs Configure.	176	# exist and runs the "Makefile.config" target, which runs Configure.
Lines 484-490 Link Here
484	%/install.merge:	487	%/install.merge:
485	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \	488	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
486	SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)	489	SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
487	$(SUBDIRS:%=%/all): %/all: $(CURDIR)/%	490	$(SUBDIRS:%=%/all): %/all: $(CURDIR)/% importinc
488	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \	491	$(MAKE) -C $(dir $@) -f $(SRCDIR)/$(SUBDIR)/$(dir $@)Makefile \
489	SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)	492	SRCDIR=$(SRCDIR) BUILDDIR=$(BUILDDIR) $(notdir $@)
490	$(SUBDIRS:%=%/mergetrylist): %/mergetrylist: $(CURDIR)/% FORCE	493	$(SUBDIRS:%=%/mergetrylist): %/mergetrylist: $(CURDIR)/% FORCE

Return to bug 116665