Commit 81fd05ae authored Sep 05, 2013 by Mike Hommey

Bug 912293 - Add a generic header and footer to generated Makefiles. r=gps

parent b4113628

config/autoconf.mk.in

+3 −0

Original line number	Diff line number	Diff line
		ifndef INCLUDED_AUTOCONF_MK
		INCLUDED_AUTOCONF_MK = 1
		include $(DEPTH)/config/emptyvars.mk
		@ALLSUBSTS@
		include $(topsrcdir)/config/baseconfig.mk
		endif

config/baseconfig.mk

+0 −2

Original line number	Diff line number	Diff line
		INCLUDED_AUTOCONF_MK = 1

		includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
		idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
		installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)

config/rules.mk

+6 −0

Original line number	Diff line number	Diff line
		@@ -10,6 +10,12 @@ ifndef topsrcdir
		$(error topsrcdir was not set))
		endif

		# Define an include-at-most-once flag
		ifdef INCLUDED_RULES_MK
		$(error Do not include rules.mk twice!)
		endif
		INCLUDED_RULES_MK = 1

		# Integrate with mozbuild-generated make files. We first verify that no
		# variables provided by the automatically generated .mk files are
		# present. If they are, this is a violation of the separation of

js/src/config/autoconf.mk.in

+3 −0

Original line number	Diff line number	Diff line
		ifndef INCLUDED_AUTOCONF_MK
		INCLUDED_AUTOCONF_MK = 1
		include $(DEPTH)/config/emptyvars.mk
		@ALLSUBSTS@
		include $(topsrcdir)/config/baseconfig.mk
		endif

js/src/config/baseconfig.mk

+0 −2

Original line number	Diff line number	Diff line
		INCLUDED_AUTOCONF_MK = 1

		installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
		sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)