xmlconfig: move into src/util
v2: attempt to fix Android build (Emil) v3: add missing include path Reviewed-by: Marek Olšák <marek.olsak@amd.com> (v1)
This commit is contained in:
parent
1e40d2c882
commit
601093f95d
|
@ -2898,7 +2898,6 @@ AC_CONFIG_FILES([Makefile
|
|||
src/mesa/gl.pc
|
||||
src/mesa/drivers/dri/dri.pc
|
||||
src/mesa/drivers/dri/common/Makefile
|
||||
src/mesa/drivers/dri/common/xmlpool/Makefile
|
||||
src/mesa/drivers/dri/i915/Makefile
|
||||
src/mesa/drivers/dri/i965/Makefile
|
||||
src/mesa/drivers/dri/Makefile
|
||||
|
@ -2912,6 +2911,7 @@ AC_CONFIG_FILES([Makefile
|
|||
src/mesa/main/tests/Makefile
|
||||
src/util/Makefile
|
||||
src/util/tests/hash_table/Makefile
|
||||
src/util/xmlpool/Makefile
|
||||
src/vulkan/Makefile])
|
||||
|
||||
AC_OUTPUT
|
||||
|
|
|
@ -28,7 +28,7 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/src/mapi \
|
||||
-I$(top_srcdir)/src/mesa \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_builddir)/src/util \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
$(GALLIUM_CFLAGS) \
|
||||
$(LIBDRM_CFLAGS) \
|
||||
|
|
|
@ -30,7 +30,7 @@
|
|||
*/
|
||||
|
||||
#include "utils.h"
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
#include "dri_screen.h"
|
||||
#include "dri_context.h"
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#define DRI_SCREEN_H
|
||||
|
||||
#include "dri_util.h"
|
||||
#include "xmlconfig.h"
|
||||
#include "util/xmlconfig.h"
|
||||
|
||||
#include "pipe/p_compiler.h"
|
||||
#include "pipe/p_context.h"
|
||||
|
|
|
@ -27,7 +27,6 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/loader \
|
||||
-I$(top_srcdir)/src/mapi/ \
|
||||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
|
||||
-I$(top_srcdir)/src/gallium/winsys \
|
||||
-I$(top_srcdir)/src/gallium/state_trackers/nine \
|
||||
|
|
|
@ -37,8 +37,8 @@
|
|||
#include "d3dadapter/d3dadapter9.h"
|
||||
#include "d3dadapter/drm.h"
|
||||
|
||||
#include "xmlconfig.h"
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlconfig.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
#include <drm.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
|
|
@ -39,14 +39,14 @@ libloader_la_LIBADD =
|
|||
|
||||
if HAVE_DRICOMMON
|
||||
libloader_la_CPPFLAGS += \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common/ \
|
||||
-I$(top_builddir)/src/util/ \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common/ \
|
||||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/mapi/ \
|
||||
-DUSE_DRICONF
|
||||
|
||||
libloader_la_LIBADD += \
|
||||
$(top_builddir)/src/mesa/drivers/dri/common/libxmlconfig.la
|
||||
$(top_builddir)/src/util/libxmlconfig.la
|
||||
|
||||
endif
|
||||
|
||||
|
|
|
@ -46,8 +46,8 @@
|
|||
#ifdef HAVE_LIBDRM
|
||||
#include <xf86drm.h>
|
||||
#ifdef USE_DRICONF
|
||||
#include "xmlconfig.h"
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlconfig.h"
|
||||
#include "util/xmlpool.h"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
|
|
|
@ -7,6 +7,5 @@ if env['x11']:
|
|||
|
||||
if env['dri']:
|
||||
SConscript([
|
||||
'dri/common/xmlpool/SConscript',
|
||||
'dri/common/SConscript',
|
||||
])
|
||||
|
|
|
@ -65,7 +65,7 @@ mesa_dri_drivers_la_LIBADD = \
|
|||
../../libmesa.la \
|
||||
common/libmegadriver_stub.la \
|
||||
common/libdricommon.la \
|
||||
common/libxmlconfig.la \
|
||||
$(top_builddir)/src/util/libxmlconfig.la \
|
||||
$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
|
||||
$(MEGADRIVERS_DEPS) \
|
||||
$(DRI_LIB_DEPS) \
|
||||
|
|
|
@ -44,53 +44,7 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
|||
$(intermediates)
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(DRI_COMMON_FILES) \
|
||||
$(XMLCONFIG_FILES)
|
||||
|
||||
MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
|
||||
LOCAL_GENERATED_SOURCES := $(MESA_DRI_OPTIONS_H)
|
||||
|
||||
#
|
||||
# Generate options.h from gettext translations.
|
||||
#
|
||||
|
||||
MESA_DRI_OPTIONS_LANGS := de es nl fr sv
|
||||
POT := $(intermediates)/xmlpool.pot
|
||||
|
||||
$(POT): $(LOCAL_PATH)/xmlpool/t_options.h
|
||||
@mkdir -p $(dir $@)
|
||||
xgettext -L C --from-code utf-8 -o $@ $<
|
||||
|
||||
$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT)
|
||||
lang=$(basename $(notdir $@)); \
|
||||
mkdir -p $(dir $@); \
|
||||
if [ -f $< ]; then \
|
||||
msgmerge -o $@ $^; \
|
||||
else \
|
||||
msginit -i $(POT) \
|
||||
-o $@ \
|
||||
--locale=$$lang \
|
||||
--no-translator; \
|
||||
sed -i -e 's/charset=.*\\n/charset=UTF-8\\n/' $@; \
|
||||
fi
|
||||
|
||||
PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
|
||||
PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
|
||||
PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
|
||||
PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%/LC_MESSAGES/options.mo)
|
||||
|
||||
LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)
|
||||
|
||||
$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%/LC_MESSAGES/options.mo: $(intermediates)/xmlpool/%.po
|
||||
mkdir -p $(dir $@)
|
||||
msgfmt -o $@ $<
|
||||
|
||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ $(PRIVATE_TEMPLATE_HEADER) \
|
||||
$(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
|
||||
|
||||
$(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
|
||||
$(transform-generated-source)
|
||||
$(DRI_COMMON_FILES)
|
||||
|
||||
include $(MESA_COMMON_MK)
|
||||
include $(BUILD_STATIC_LIBRARY)
|
||||
|
|
|
@ -19,11 +19,9 @@
|
|||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
# IN THE SOFTWARE.
|
||||
|
||||
SUBDIRS = xmlpool
|
||||
|
||||
include Makefile.sources
|
||||
|
||||
EXTRA_DIST = drirc xmlpool.h SConscript
|
||||
EXTRA_DIST = SConscript
|
||||
|
||||
AM_CFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
|
@ -32,22 +30,15 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_builddir)/src/util/ \
|
||||
$(LIBDRM_CFLAGS) \
|
||||
$(DEFINES) \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
$(VISIBILITY_CFLAGS)
|
||||
|
||||
noinst_LTLIBRARIES = \
|
||||
libdricommon.la \
|
||||
libxmlconfig.la \
|
||||
libmegadriver_stub.la
|
||||
|
||||
libdricommon_la_SOURCES = $(DRI_COMMON_FILES)
|
||||
|
||||
libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
|
||||
libxmlconfig_la_CFLAGS = $(AM_CFLAGS) $(EXPAT_CFLAGS)
|
||||
libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
|
||||
|
||||
libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES)
|
||||
|
||||
sysconf_DATA = drirc
|
||||
|
|
|
@ -4,10 +4,6 @@ DRI_COMMON_FILES := \
|
|||
dri_util.c \
|
||||
dri_util.h
|
||||
|
||||
XMLCONFIG_FILES := \
|
||||
xmlconfig.c \
|
||||
xmlconfig.h
|
||||
|
||||
# Paths are relative to MESA_TOP.
|
||||
mesa_dri_common_INCLUDES := \
|
||||
include \
|
||||
|
@ -15,7 +11,8 @@ mesa_dri_common_INCLUDES := \
|
|||
src/egl/main \
|
||||
src/mapi \
|
||||
src/mesa \
|
||||
src/mesa/drivers/dri/common
|
||||
src/mesa/drivers/dri/common \
|
||||
src/util
|
||||
|
||||
megadriver_stub_FILES := \
|
||||
megadriver_stub.c
|
||||
|
|
|
@ -7,7 +7,6 @@ drienv = env.Clone()
|
|||
|
||||
drienv.Replace(CPPPATH = [
|
||||
'#src/mesa/drivers/dri/common',
|
||||
xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
|
||||
'#include',
|
||||
'#include/GL/internal',
|
||||
'#src',
|
||||
|
@ -26,13 +25,10 @@ drienv.Replace(CPPPATH = [
|
|||
'#src/mesa/swrast_setup',
|
||||
'#src/egl/main',
|
||||
'#src/egl/drivers/dri',
|
||||
'#src/util',
|
||||
])
|
||||
|
||||
drienv.AppendUnique(LIBS = [
|
||||
'expat',
|
||||
])
|
||||
|
||||
sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES', 'XMLCONFIG_FILES' ])
|
||||
sources = drienv.ParseSourceList('Makefile.sources', ['DRI_COMMON_FILES'])
|
||||
|
||||
dri_common = drienv.ConvenienceLibrary(
|
||||
target = 'dri_common',
|
||||
|
|
|
@ -42,7 +42,7 @@
|
|||
#include <stdbool.h>
|
||||
#include "dri_util.h"
|
||||
#include "utils.h"
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
#include "main/mtypes.h"
|
||||
#include "main/framebuffer.h"
|
||||
#include "main/version.h"
|
||||
|
|
|
@ -56,7 +56,7 @@
|
|||
#include <GL/gl.h>
|
||||
#include <GL/internal/dri_interface.h>
|
||||
#include "main/mtypes.h"
|
||||
#include "xmlconfig.h"
|
||||
#include "util/xmlconfig.h"
|
||||
#include <stdbool.h>
|
||||
|
||||
/**
|
||||
|
|
|
@ -30,7 +30,7 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_builddir)/src/util \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
$(DEFINES) \
|
||||
$(VISIBILITY_CFLAGS) \
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
#include "swrast/s_renderbuffer.h"
|
||||
|
||||
#include "utils.h"
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
static const __DRIconfigOptionsExtension i915_config_options = {
|
||||
.base = { __DRI_CONFIG_OPTIONS, 1 },
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include "dri_util.h"
|
||||
#include "intel_bufmgr.h"
|
||||
#include "i915_drm.h"
|
||||
#include "xmlconfig.h"
|
||||
#include "util/xmlconfig.h"
|
||||
|
||||
struct intel_screen
|
||||
{
|
||||
|
|
|
@ -30,7 +30,7 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_builddir)/src/util \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_srcdir)/src/gtest/include \
|
||||
-I$(top_builddir)/src/compiler/glsl \
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "compiler/nir/nir.h"
|
||||
|
||||
#include "utils.h"
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
#ifndef DRM_FORMAT_MOD_INVALID
|
||||
#define DRM_FORMAT_MOD_INVALID ((1ULL<<56) - 1)
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
#include "brw_bufmgr.h"
|
||||
#include "common/gen_device_info.h"
|
||||
#include "i915_drm.h"
|
||||
#include "xmlconfig.h"
|
||||
#include "util/xmlconfig.h"
|
||||
|
||||
#include "isl/isl.h"
|
||||
|
||||
|
|
|
@ -34,7 +34,7 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_builddir)/src/util \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
|
||||
$(DEFINES) \
|
||||
|
|
|
@ -65,7 +65,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "radeon_span.h"
|
||||
|
||||
#include "utils.h"
|
||||
#include "xmlpool.h" /* for symbolic values of enum-type options */
|
||||
#include "util/xmlpool.h" /* for symbolic values of enum-type options */
|
||||
|
||||
/* Return various strings for glGetString().
|
||||
*/
|
||||
|
|
|
@ -49,7 +49,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "r200_state.h"
|
||||
#include "radeon_queryobj.h"
|
||||
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
/* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in
|
||||
* 1.3 cmdbuffers allow all previous state to be updated as well as
|
||||
|
|
|
@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "r200_ioctl.h"
|
||||
#include "r200_tex.h"
|
||||
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -35,7 +35,7 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_builddir)/src/util \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
|
||||
$(DEFINES) \
|
||||
|
|
|
@ -33,7 +33,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
**************************************************************************/
|
||||
|
||||
#include "radeon_common.h"
|
||||
#include "xmlpool.h" /* for symbolic values of enum-type options */
|
||||
#include "util/xmlpool.h" /* for symbolic values of enum-type options */
|
||||
#include "utils.h"
|
||||
#include "drivers/common/meta.h"
|
||||
#include "main/context.h"
|
||||
|
|
|
@ -67,7 +67,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "radeon_fog.h"
|
||||
|
||||
#include "utils.h"
|
||||
#include "xmlpool.h" /* for symbolic values of enum-type options */
|
||||
#include "util/xmlpool.h" /* for symbolic values of enum-type options */
|
||||
|
||||
extern const struct tnl_pipeline_stage _radeon_render_stage;
|
||||
extern const struct tnl_pipeline_stage _radeon_tcl_stage;
|
||||
|
|
|
@ -62,7 +62,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
|
||||
/* Radeon configuration
|
||||
*/
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
#define DRI_CONF_COMMAND_BUFFER_SIZE(def,min,max) \
|
||||
DRI_CONF_OPT_BEGIN_V(command_buffer_size,int,def, # min ":" # max ) \
|
||||
|
|
|
@ -45,7 +45,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "dri_util.h"
|
||||
#include "radeon_chipset.h"
|
||||
#include "radeon_reg.h"
|
||||
#include "xmlconfig.h"
|
||||
#include "util/xmlconfig.h"
|
||||
|
||||
|
||||
typedef struct {
|
||||
|
|
|
@ -44,7 +44,7 @@
|
|||
|
||||
#include "../r200/r200_reg.h"
|
||||
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
/* New (1.3) state mechanism. 3 commands (packet, scalar, vector) in
|
||||
* 1.3 cmdbuffers allow all previous state to be updated as well as
|
||||
|
|
|
@ -44,7 +44,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|||
#include "radeon_ioctl.h"
|
||||
#include "radeon_tex.h"
|
||||
|
||||
#include "xmlpool.h"
|
||||
#include "util/xmlpool.h"
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
#include "main/texobj.h"
|
||||
#include "drivers/common/meta.h"
|
||||
|
||||
#include "xmlpool.h" /* for symbolic values of enum-type options */
|
||||
#include "util/xmlpool.h" /* for symbolic values of enum-type options */
|
||||
|
||||
#include "radeon_common.h"
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ AM_CFLAGS = \
|
|||
-I$(top_srcdir)/src/mesa/ \
|
||||
-I$(top_srcdir)/src/gallium/include \
|
||||
-I$(top_srcdir)/src/gallium/auxiliary \
|
||||
-I$(top_builddir)/src/mesa/drivers/dri/common \
|
||||
-I$(top_builddir)/src/util \
|
||||
-I$(top_srcdir)/src/mesa/drivers/dri/common \
|
||||
$(LIBDRM_CFLAGS) \
|
||||
$(DEFINES) \
|
||||
|
|
|
@ -31,7 +31,8 @@ include $(LOCAL_PATH)/Makefile.sources
|
|||
include $(CLEAR_VARS)
|
||||
|
||||
LOCAL_SRC_FILES := \
|
||||
$(MESA_UTIL_FILES)
|
||||
$(MESA_UTIL_FILES) \
|
||||
$(XMLCONFIG_FILES)
|
||||
|
||||
LOCAL_C_INCLUDES := \
|
||||
external/zlib \
|
||||
|
@ -47,11 +48,56 @@ LOCAL_MODULE := libmesa_util
|
|||
LOCAL_MODULE_CLASS := STATIC_LIBRARIES
|
||||
|
||||
intermediates := $(call local-generated-sources-dir)
|
||||
LOCAL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
|
||||
UTIL_GENERATED_SOURCES := $(addprefix $(intermediates)/,$(MESA_UTIL_GENERATED_FILES))
|
||||
LOCAL_GENERATED_SOURCES := $(UTIL_GENERATED_SOURCES)
|
||||
|
||||
MESA_DRI_OPTIONS_H := $(intermediates)/xmlpool/options.h
|
||||
LOCAL_GENERATED_SOURCES += $(MESA_DRI_OPTIONS_H)
|
||||
|
||||
#
|
||||
# Generate options.h from gettext translations.
|
||||
#
|
||||
|
||||
MESA_DRI_OPTIONS_LANGS := de es nl fr sv
|
||||
POT := $(intermediates)/xmlpool.pot
|
||||
|
||||
$(POT): $(LOCAL_PATH)/xmlpool/t_options.h
|
||||
@mkdir -p $(dir $@)
|
||||
xgettext -L C --from-code utf-8 -o $@ $<
|
||||
|
||||
$(intermediates)/xmlpool/%.po: $(LOCAL_PATH)/xmlpool/%.po $(POT)
|
||||
lang=$(basename $(notdir $@)); \
|
||||
mkdir -p $(dir $@); \
|
||||
if [ -f $< ]; then \
|
||||
msgmerge -o $@ $^; \
|
||||
else \
|
||||
msginit -i $(POT) \
|
||||
-o $@ \
|
||||
--locale=$$lang \
|
||||
--no-translator; \
|
||||
sed -i -e 's/charset=.*\\n/charset=UTF-8\\n/' $@; \
|
||||
fi
|
||||
|
||||
PRIVATE_SCRIPT := $(LOCAL_PATH)/xmlpool/gen_xmlpool.py
|
||||
PRIVATE_LOCALEDIR := $(intermediates)/xmlpool
|
||||
PRIVATE_TEMPLATE_HEADER := $(LOCAL_PATH)/xmlpool/t_options.h
|
||||
PRIVATE_MO_FILES := $(MESA_DRI_OPTIONS_LANGS:%=$(intermediates)/xmlpool/%/LC_MESSAGES/options.mo)
|
||||
|
||||
LOCAL_GENERATED_SOURCES += $(PRIVATE_MO_FILES)
|
||||
|
||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_PYTHON := $(MESA_PYTHON2)
|
||||
$(LOCAL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
|
||||
$(LOCAL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
|
||||
|
||||
$(PRIVATE_MO_FILES): $(intermediates)/xmlpool/%/LC_MESSAGES/options.mo: $(intermediates)/xmlpool/%.po
|
||||
mkdir -p $(dir $@)
|
||||
msgfmt -o $@ $<
|
||||
|
||||
$(UTIL_GENERATED_SOURCES): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ > $@
|
||||
$(UTIL_GENERATED_SOURCES): $(intermediates)/%.c: $(LOCAL_PATH)/%.py
|
||||
$(transform-generated-source)
|
||||
|
||||
$(MESA_DRI_OPTIONS_H): PRIVATE_CUSTOM_TOOL = $(PRIVATE_PYTHON) $^ $(PRIVATE_TEMPLATE_HEADER) \
|
||||
$(PRIVATE_LOCALEDIR) $(MESA_DRI_OPTIONS_LANGS) > $@
|
||||
$(MESA_DRI_OPTIONS_H): $(PRIVATE_SCRIPT) $(PRIVATE_TEMPLATE_HEADER) $(PRIVATE_MO_FILES)
|
||||
$(transform-generated-source)
|
||||
|
||||
include $(MESA_COMMON_MK)
|
||||
|
|
|
@ -19,11 +19,13 @@
|
|||
# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
||||
# IN THE SOFTWARE.
|
||||
|
||||
SUBDIRS = . tests/hash_table
|
||||
SUBDIRS = xmlpool . tests/hash_table
|
||||
|
||||
include Makefile.sources
|
||||
|
||||
noinst_LTLIBRARIES = libmesautil.la
|
||||
noinst_LTLIBRARIES = \
|
||||
libmesautil.la \
|
||||
libxmlconfig.la
|
||||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/include
|
||||
|
@ -46,6 +48,18 @@ libmesautil_la_SOURCES = \
|
|||
|
||||
libmesautil_la_LIBADD = $(ZLIB_LIBS)
|
||||
|
||||
libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES)
|
||||
libxmlconfig_la_CFLAGS = \
|
||||
$(DEFINES) \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/src \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
$(VISIBILITY_CFLAGS) \
|
||||
$(EXPAT_CFLAGS)
|
||||
libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm
|
||||
|
||||
sysconf_DATA = drirc
|
||||
|
||||
roundeven_test_LDADD = -lm
|
||||
|
||||
check_PROGRAMS = u_atomic_test roundeven_test
|
||||
|
@ -54,8 +68,10 @@ TESTS = $(check_PROGRAMS)
|
|||
BUILT_SOURCES = $(MESA_UTIL_GENERATED_FILES)
|
||||
CLEANFILES = $(BUILT_SOURCES)
|
||||
EXTRA_DIST = \
|
||||
drirc \
|
||||
format_srgb.py \
|
||||
SConscript \
|
||||
xmlpool.h \
|
||||
sha1/README
|
||||
|
||||
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
|
||||
|
|
|
@ -56,3 +56,7 @@ MESA_UTIL_FILES := \
|
|||
|
||||
MESA_UTIL_GENERATED_FILES = \
|
||||
format_srgb.c
|
||||
|
||||
XMLCONFIG_FILES := \
|
||||
xmlconfig.c \
|
||||
xmlconfig.h
|
||||
|
|
|
@ -2,6 +2,10 @@ import common
|
|||
|
||||
Import('*')
|
||||
|
||||
SConscript([
|
||||
'xmlpool',
|
||||
])
|
||||
|
||||
from sys import executable as python_cmd
|
||||
|
||||
env = env.Clone()
|
||||
|
@ -10,6 +14,7 @@ env.MSVC2013Compat()
|
|||
|
||||
env.Prepend(CPPPATH = [
|
||||
'#include',
|
||||
xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
|
||||
'#src',
|
||||
'#src/mapi',
|
||||
'#src/mesa',
|
||||
|
@ -30,10 +35,17 @@ source_lists = env.ParseSourceList('Makefile.sources')
|
|||
|
||||
mesautil_sources = (
|
||||
source_lists['MESA_UTIL_FILES'] +
|
||||
source_lists['MESA_UTIL_GENERATED_FILES']
|
||||
source_lists['MESA_UTIL_GENERATED_FILES'] +
|
||||
source_lists['XMLCONFIG_FILES']
|
||||
)
|
||||
|
||||
mesautil = env.ConvenienceLibrary(
|
||||
mesautilenv = env.Clone()
|
||||
|
||||
mesautilenv.AppendUnique(LIBS = [
|
||||
'expat',
|
||||
])
|
||||
|
||||
mesautil = mesautilenv.ConvenienceLibrary(
|
||||
target = 'mesautil',
|
||||
source = mesautil_sources,
|
||||
)
|
||||
|
|
Loading…
Reference in New Issue