diff options
| author | Tony Theodore <tonyt@logyst.com> | 2017-07-24 09:20:55 (GMT) |
|---|---|---|
| committer | Tony Theodore <tonyt@logyst.com> | 2017-10-31 12:34:15 (GMT) |
| commit | 7bec03d8ad64ae6fb916ce96123cf625085a9f03 (patch) | |
| tree | 30d3cca68e00b0ab8db95f5c16a1040c085c6a05 /src/gtk2.mk | |
| parent | cbebe1c8781d77cb7f7c79fea97a5001e0b0a423 (diff) | |
| download | mxe-7bec03d8ad64ae6fb916ce96123cf625085a9f03.zip mxe-7bec03d8ad64ae6fb916ce96123cf625085a9f03.tar.gz mxe-7bec03d8ad64ae6fb916ce96123cf625085a9f03.tar.bz2 | |
gtk2/3: use new-style options and remove gailutil.def
`gailutil.def` causes package conflicts and `*.def` files aren't
really relevant for MXE (see #1772).
Diffstat (limited to 'src/gtk2.mk')
| -rw-r--r-- | src/gtk2.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gtk2.mk b/src/gtk2.mk index 884bb03..210d7ac 100644 --- a/src/gtk2.mk +++ b/src/gtk2.mk @@ -21,7 +21,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - cd '$(1)' && ./configure \ + cd '$(BUILD_DIR)' && '$(SOURCE_DIR)/configure' \ $(MXE_CONFIGURE_OPTS) \ --enable-explicit-deps \ --disable-glibtest \ @@ -32,7 +32,12 @@ define $(PKG)_BUILD --disable-man \ --with-included-immodules \ --without-x - $(MAKE) -C '$(1)' -j '$(JOBS)' install bin_PROGRAMS= sbin_PROGRAMS= noinst_PROGRAMS= + $(MAKE) -C '$(BUILD_DIR)' -j '$(JOBS)' $(MXE_DISABLE_CRUFT) EXTRA_DIST= + $(MAKE) -C '$(BUILD_DIR)' -j 1 install $(MXE_DISABLE_CRUFT) EXTRA_DIST= + + # cleanup to avoid gtk2/3 conflicts (EXTRA_DIST doesn't exclude it) + # and *.def files aren't really relevant for MXE + rm -f '$(PREFIX)/$(TARGET)/lib/gailutil.def' '$(TARGET)-gcc' \ -W -Wall -Werror -ansi \ |