Ticket #17516: r733.diff

File r733.diff, 1.2 KB (added by ryandesign (Ryan Carsten Schmidt), 16 years ago)
  • GNUmakefile

     
    5959
    6060include $(BUILDDIR)/Makefile.config
    6161
    62 PRODUCT_SUBDIRS = lib converter analyzer editor generator other
     62PROG_SUBDIRS = converter analyzer editor generator other
     63PRODUCT_SUBDIRS = lib $(PROG_SUBDIRS)
    6364SUPPORT_SUBDIRS = urt buildtools
    6465
    6566SUBDIRS = $(PRODUCT_SUBDIRS) $(SUPPORT_SUBDIRS)
     
    8788.PHONY: nonmerge
    8889nonmerge: $(PRODUCT_SUBDIRS:%=%/all)
    8990
     91# Parallel make (make --jobs) is not smart enough to coordinate builds
     92# between submakes, so a naive parallel make would cause certain
     93# targets to get built multiple times simultaneously.  That is usually
     94# unacceptable.  So we introduce extra dependencies here just to make
     95# sure such targets are already up to date before the submake starts,
     96# for the benefit of parallel make.  Note that we ensure that parallel
     97# make works for 'make all' in the top directory, but it may still fail
     98# for the aforementioned reason for other invocations.
     99
     100$(SUBDIRS:%=%/all): pm_config.h inttypes_netpbm.h version.h
     101$(PROG_SUBDIRS:%=%/all): lib/all $(SUPPORT_SUBDIRS:%=%/all)
     102
    90103OMIT_CONFIG_RULE = 1
    91104OMIT_VERSION_H_RULE = 1
    92105OMIT_INTTYPES_RULE = 1