diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile (renamed from GNUmakefile.mk) | 0 | ||||
| -rw-r--r-- | Makefile.in | 79 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | solenv/gbuild/extensions/post_AuxTargets.mk | 2 |
5 files changed, 2 insertions, 82 deletions
diff --git a/.gitignore b/.gitignore index a7f5466caa95..caf15fb52c68 100644 --- a/.gitignore +++ b/.gitignore @@ -53,7 +53,6 @@ /config.parms /configure /desktop/scripts/soffice.sh -/Makefile /makefile.mk /set_soenv /post_download diff --git a/GNUmakefile.mk b/Makefile index d40695c441a5..d40695c441a5 100644 --- a/GNUmakefile.mk +++ b/Makefile diff --git a/Makefile.in b/Makefile.in deleted file mode 100644 index b02ea16df7c4..000000000000 --- a/Makefile.in +++ /dev/null @@ -1,79 +0,0 @@ -# @configure_input@ - -SHELL=/usr/bin/env bash - -.PHONY : build dev-install all cross_toolset install distro-pack-install clean clean-host clean-build distclean findunusedcode bootstrap - -define forward_to_gbuild -@GNUMAKE@ -f $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/GNUmakefile.mk \ - $(if @VERBOSE@,,-s) \ - $(1) -endef - -all: - @$(call forward_to_gbuild,$@) - -check: - @$(call forward_to_gbuild,$@) - -bootstrap: - @$(call forward_to_gbuild,$@) - -debugrun: - @$(call forward_to_gbuild,$@) - -%check: - @$(call forward_to_gbuild,$@) - -distro-pack-install: install - @$(call forward_to_gbuild,$@) - -id: - @$(call forward_to_gbuild,$@) - -tags: - @$(call forward_to_gbuild,$@) - -docs: - @$(call forward_to_gbuild,$@) - -build: Makefile - @$(call forward_to_gbuild,$@) - -dev-install: Makefile - @$(call forward_to_gbuild,$@) - -cross_toolset: - @$(call forward_to_gbuild,$@) - -clean: - @$(call forward_to_gbuild,$@) - -clean-host: - @$(call forward_to_gbuild,$@) - -clean-build: - @$(call forward_to_gbuild,$@) - -distclean: - @$(call forward_to_gbuild,$@) - -fetch: - @$(call forward_to_gbuild,$@) - -unitcheck: - @$(call forward_to_gbuild,$@) - -install: - @$(call forward_to_gbuild,$@) - -findunusedcode: - @$(call forward_to_gbuild,$@) - -ifeq ($(filter clean distclean,$(MAKECMDGOALS)),) -Makefile: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in - ./autogen.sh -endif - -#as long as we are not completely gbuildified we need to explicitly depend on the build/install -#debugrun : dev-install # disabled for now, this dep seems to poison the debugrun !? diff --git a/configure.in b/configure.in index 005a68e7422f..b9b357776886 100644 --- a/configure.in +++ b/configure.in @@ -9721,7 +9721,7 @@ else echo > set_soenv.last fi -AC_CONFIG_FILES([ooo.lst set_soenv Makefile bin/repo-list desktop/scripts/soffice.sh build_env]) +AC_CONFIG_FILES([ooo.lst set_soenv bin/repo-list desktop/scripts/soffice.sh build_env]) AC_OUTPUT # make sure this is executable diff --git a/solenv/gbuild/extensions/post_AuxTargets.mk b/solenv/gbuild/extensions/post_AuxTargets.mk index 22aa4ed00c0c..a08d46ea8f0d 100644 --- a/solenv/gbuild/extensions/post_AuxTargets.mk +++ b/solenv/gbuild/extensions/post_AuxTargets.mk @@ -49,7 +49,7 @@ $(SRCDIR)/src.downloaded: $(SRCDIR)/ooo.lst $(SRCDIR)/download fetch: $(SRCDIR)/src.downloaded # fixme: can we prevent these exports in the first place? -$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in Makefile.in +$(SRCDIR)/Env.Host.sh: autogen.lastrun configure.in ooo.lst.in set_soenv.in $(if $(gb_MINISOLARENV),unset GBUILDDIR gb_Helper_execute gb_XSLTPROC gb_Helper_set_ld_path gb_AWK DBGSV_ERROR_OUT && $(SRCDIR)/autogen.sh,@echo "cannot reconfigure from within solarenv" && rm -f $(SRCDIR)/Env.Host.sh && exit 2) $(WORKDIR)/bootstrap: |