Mercurial > mxe-octave

comparison src/wxwidgets.mk @ 3014:b6c7244a2f66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use HOST_BINDIR, HOST_LIBDIR, and HOST_INCDIR instead of MXE_BINDIR, MXE_LIBDIR, and MXE_INCDIR. Attempt to use these variables consistently instead of using $(HOST_PREFIX)/bin, $(HOST_PREFIX)/lib, and $(HOST_PREFIX)/include
author John W. Eaton <jwe@octave.org>
date Sun, 02 Jun 2013 16:59:24 -0400
parents bcc26ffe9a0f
children 951da75fd09c
comparison
equal deleted inserted replaced
3013:bcc26ffe9a0f 3014:b6c7244a2f66
56 --without-odbc \ 56 --without-odbc \
57 LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" 57 LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`"
58 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= 58 $(MAKE) -C '$(1)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
59 -$(MAKE) -C '$(1)/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo 59 -$(MAKE) -C '$(1)/locale' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= allmo
60 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= 60 $(MAKE) -C '$(1)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname=
61 $(INSTALL) -m755 '$(HOST_PREFIX)/bin/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config' 61 $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config'
62 62
63 # build the wxWidgets variant without unicode support 63 # build the wxWidgets variant without unicode support
64 cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets) 64 cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,wxwidgets)
65 $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/wxwidgets-*.patch)), 65 $(foreach PKG_PATCH,$(sort $(wildcard $(TOP_DIR)/src/wxwidgets-*.patch)),
66 (cd '$(1)/$(wxwidgets_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH)) 66 (cd '$(1)/$(wxwidgets_SUBDIR)' && $(PATCH) -p1 -u) < $(PKG_PATCH))
105 LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`" 105 LIBS=" `'$(TARGET)-pkg-config' --libs-only-l libtiff-4`"
106 $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= 106 $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j '$(JOBS)' bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS=
107 107
108 # backup of the unicode wx-config script 108 # backup of the unicode wx-config script
109 # such that "make install" won't overwrite it 109 # such that "make install" won't overwrite it
110 mv '$(HOST_PREFIX)/bin/wx-config' '$(HOST_PREFIX)/bin/wx-config-backup' 110 mv '$(HOST_BINDIR)/wx-config' '$(HOST_BINDIR)/wx-config-backup'
111 111
112 $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname= 112 $(MAKE) -C '$(1)/$(wxwidgets_SUBDIR)' -j 1 install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= __install_wxrc___depname=
113 mv '$(HOST_PREFIX)/bin/wx-config' '$(HOST_PREFIX)/bin/wx-config-nounicode' 113 mv '$(HOST_BINDIR)/wx-config' '$(HOST_BINDIR)/wx-config-nounicode'
114 $(INSTALL) -m755 '$(HOST_PREFIX)/bin/wx-config-nounicode' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config-nounicode' 114 $(INSTALL) -m755 '$(HOST_BINDIR)/wx-config-nounicode' '$(BUILD_TOOLS_PREFIX)/bin/$(TARGET)-wx-config-nounicode'
115 115
116 # restore the unicode wx-config script 116 # restore the unicode wx-config script
117 mv '$(HOST_PREFIX)/bin/wx-config-backup' '$(HOST_PREFIX)/bin/wx-config' 117 mv '$(HOST_BINDIR)/wx-config-backup' '$(HOST_BINDIR)/wx-config'
118 118
119 # build test program 119 # build test program
120 '$(TARGET)-g++' \ 120 '$(TARGET)-g++' \
121 -W -Wall -Werror -pedantic -std=gnu++0x \ 121 -W -Wall -Werror -pedantic -std=gnu++0x \
122 '$(2).cpp' -o '$(HOST_PREFIX)/bin/test-wxwidgets.exe' \ 122 '$(2).cpp' -o '$(HOST_BINDIR)/test-wxwidgets.exe' \
123 `'$(TARGET)-wx-config' --cflags --libs` 123 `'$(TARGET)-wx-config' --cflags --libs`
124 endef 124 endef