7 files changed, 14 insertions, 85 deletions
diff --git a/config_host/config_version.h.in b/config_host/config_version.h.in
index 736c578afc8c..0d788826ab86 100644
--- a/config_host/config_version.h.in
+++ b/config_host/config_version.h.in
@@ -13,6 +13,7 @@ Version settings
 #undef LIBO_VERSION_MINOR
 #undef LIBO_VERSION_MICRO
 #undef LIBO_VERSION_PATCH
+#undef LIBO_THIS_YEAR
 
 #define LIBO_VERSION_DOTTED \
     (LIBO_VERSION_STRINGIFY(LIBO_VERSION_MAJOR) "." \
diff --git a/configure.ac b/configure.ac
index b2021729efba..5a201f5bd078 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4138,14 +4138,14 @@ AC_SUBST(LIBO_VERSION_PATCH)
 AC_SUBST(LIBO_VERSION_SUFFIX)
 AC_SUBST(LIBO_VERSION_SUFFIX_SUFFIX)
 
+LIBO_THIS_YEAR=`date +%Y`
+AC_SUBST(LIBO_THIS_YEAR)
+
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MAJOR,$LIBO_VERSION_MAJOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MINOR,$LIBO_VERSION_MINOR)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_MICRO,$LIBO_VERSION_MICRO)
 AC_DEFINE_UNQUOTED(LIBO_VERSION_PATCH,$LIBO_VERSION_PATCH)
-
-LIBO_THIS_YEAR=`date +%Y`
-AC_SUBST(LIBO_THIS_YEAR)
-
+AC_DEFINE_UNQUOTED(LIBO_THIS_YEAR,$LIBO_THIS_YEAR)
 
 # This UPD silly thing must go away soon
 UPD="${LIBO_VERSION_MAJOR}${LIBO_VERSION_MINOR}0"
diff --git a/solenv/CustomTarget_versionlist.mk b/solenv/CustomTarget_versionlist.mk
deleted file mode 100644
index eb8b4406aca4..000000000000
--- a/solenv/CustomTarget_versionlist.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,solenv/versionlist))
-
-$(eval $(call gb_CustomTarget_register_targets,solenv/versionlist,\
-	versionlist.hrc \
-))
-
-$(call gb_CustomTarget_get_workdir,solenv/versionlist)/versionlist.hrc :
-	$(call gb_Output_announce,solenv/versionlist,$(true),ECH,1)
-	echo '#define VERSION $(LIBO_VERSION_MAJOR)' > $@ && \
-	echo '#define SUBVERSION $(LIBO_VERSION_MINOR)' >> $@ && \
-	echo '#define MICROVERSION $(LIBO_VERSION_MICRO)' >> $@ && \
-	echo '#define VER_YEARRANGE 2000-$(LIBO_THIS_YEAR)' >> $@
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/Module_solenv.mk b/solenv/Module_solenv.mk
index c34dc468c76f..e606c10d1a6e 100644
--- a/solenv/Module_solenv.mk
+++ b/solenv/Module_solenv.mk
@@ -27,11 +27,6 @@
 
 $(eval $(call gb_Module_Module,solenv))
 
-$(eval $(call gb_Module_add_targets,solenv,\
-	CustomTarget_versionlist \
-	Package_inc \
-))
-
 ifeq ($(CROSS_COMPILING),$(false))
 $(eval $(call gb_Module_add_targets,solenv,\
 	Executable_concat-deps \
diff --git a/solenv/Package_inc.mk b/solenv/Package_inc.mk
deleted file mode 100644
index 00a6f56e8dbc..000000000000
--- a/solenv/Package_inc.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Package_Package,solenv_inc,$(call gb_CustomTarget_get_workdir,solenv/versionlist)))
-
-$(eval $(call gb_Package_add_file,solenv_inc,inc/versionlist.hrc,versionlist.hrc))
-
-# vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/WinResTarget.mk b/solenv/gbuild/WinResTarget.mk
index 45b51ac453a5..268a9e7f3e66 100644
--- a/solenv/gbuild/WinResTarget.mk
+++ b/solenv/gbuild/WinResTarget.mk
@@ -13,13 +13,13 @@ endef
 
 define gb_WinResTarget_WinResTarget_init
 $(call gb_WinResTarget_get_target,$(1)) : DEFS := $(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC)
+$(call gb_WinResTarget_get_target,$(1)) : INCLUDE := $(SOLARINC) -I$(SRCDIR)/config_$(gb_Side)
 $(call gb_WinResTarget_get_clean_target,$(1)) : RCFILE :=
 $(call gb_WinResTarget_get_target,$(1)) : RCFILE :=
 
 ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_WinResTarget_get_dep_target,$(1)) : DEFS := $$(gb_WinResTarget_DEFAULTDEFS)
-$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE)
+$(call gb_WinResTarget_get_dep_target,$(1)) : INCLUDE := $$(gb_WinResTarget_INCLUDE) -I$(SRCDIR)/config_$(gb_Side)
 $(call gb_WinResTarget_get_dep_target,$(1)) : RCFILE :=
 
 -include $(call gb_WinResTarget_get_dep_target,$(1))
diff --git a/solenv/inc/version.hrc b/solenv/inc/version.hrc
index 859b82f8d6ca..305dc47afdc0 100644
--- a/solenv/inc/version.hrc
+++ b/solenv/inc/version.hrc
@@ -26,7 +26,13 @@
  *
  *************************************************************************/
 
-#include "versionlist.hrc"
+#include <config_version.h>
+
+#define VERSION LIBO_VERSION_MAJOR
+#define SUBVERSION LIBO_VERSION_MINOR
+#define MICROVERSION LIBO_VERSION_MICRO
+#define VER_YEARRANGE 2000-LIBO_THIS_YEAR
+
 #include <winver.h>
 
 #ifndef PPSX