Mercurial > mxe-octave

comparison Makefile.in @ 4192:438a4bfdc887

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
new rules for creating a tarball from Octave's hg sources * hg-octave-dist.mk: New file. * Makefile.in: Include hg-octave-dist.mk. (ENV_PATH, ENV_PKG_CONFIG_PATH, ENV_LD_LIBRARY_PATH): Capture values from environment.
author John W. Eaton <jwe@octave.org>
date Mon, 29 Aug 2016 11:21:19 -0400
parents 4b0004dc5941
children 32814edc00db
comparison
equal deleted inserted replaced
4191:851b9f4a6b1c 4192:438a4bfdc887
248 PKG_DIR := $(TOP_DIR)/pkg 248 PKG_DIR := $(TOP_DIR)/pkg
249 TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1) 249 TMP_DIR = $(TOP_BUILD_DIR)/tmp-$(1)
250 MAKEFILE := $(TOP_BUILD_DIR)/Makefile 250 MAKEFILE := $(TOP_BUILD_DIR)/Makefile
251 PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html')) 251 PKGS := $(filter-out $(ALL_BUILD_TOOLS), $(shell $(SED) -n 's/^.* class="package">\([^<]*\)<.*$$/\1/p' '$(TOP_DIR)/index.html'))
252 252
253 ENV_PATH := $(PATH)
253 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH) 254 PATH := $(BUILD_TOOLS_PREFIX)/bin:$(PATH)
255
256 ENV_PKG_CONFIG_PATH := $(PKG_CONFIG_PATH)
254 257
255 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include' 258 CONFIGURE_CPPFLAGS := CPPFLAGS='-I$(HOST_PREFIX)/include'
256 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes) 259 ifeq ($(MXE_USE_LIB64_DIRECTORY),yes)
257 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64' 260 CONFIGURE_LDFLAGS := LDFLAGS='-L$(HOST_PREFIX)/lib -L$(HOST_PREFIX)/lib64'
258 PKG_CONFIG_PATH := $(HOST_PREFIX)/lib64/pkgconfig 261 PKG_CONFIG_PATH := $(HOST_PREFIX)/lib64/pkgconfig
362 endif 365 endif
363 366
364 ifeq ($(MXE_SYSTEM),mingw) 367 ifeq ($(MXE_SYSTEM),mingw)
365 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll 368 MAKE_SHARED_FROM_STATIC_OPTIONS := --windowsdll
366 endif 369 endif
370
371 ENV_LD_LIBRARY_PATH := $(LD_LIBRARY_PATH)
367 372
368 ifeq ($(MXE_SYSTEM),mingw) 373 ifeq ($(MXE_SYSTEM),mingw)
369 MXE_WINDOWS_BUILD := yes 374 MXE_WINDOWS_BUILD := yes
370 ifneq ($(MXE_NATIVE_BUILD),yes) 375 ifneq ($(MXE_NATIVE_BUILD),yes)
371 MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS 376 MSYS_URL := http://sourceforge.net/projects/mingw/files/MSYS
879 mkdir $(distdir) 884 mkdir $(distdir)
880 ( cd $(TOP_DIR) ; $(TAR) cf - $(DIST_FILES) ) | ( cd $(distdir) ; $(TAR) xpf - ) 885 ( cd $(TOP_DIR) ; $(TAR) cf - $(DIST_FILES) ) | ( cd $(distdir) ; $(TAR) xpf - )
881 $(TAR) czf $(distdir).tar.gz $(distdir) 886 $(TAR) czf $(distdir).tar.gz $(distdir)
882 887
883 include $(TOP_DIR)/binary-dist-rules.mk 888 include $(TOP_DIR)/binary-dist-rules.mk
889
890 include $(TOP_DIR)/hg-octave-dist.mk