mirror of
https://github.com/Mercury-Language/mercury.git
synced 2026-04-15 17:33:38 +00:00
compiler/options.m:
Merge the two options into one, which can be specified by either name.
compiler/module_qual.m:
Update their documentation.
compiler/module_qual.qualify_items.m:
Conform to the change above.
tests/warnings/help_text.err_exp:
Expect the merged option's documentation.
NEWS.md:
Announce the new option name.
RELEASE_NOTES_NEXT:
Schedule the old option name for deletion.
extras/base64/Mercury.options:
extras/fixed/Mercury.options:
extras/graphics/mercury_allegro/Mercury.options:
extras/graphics/mercury_cairo/Mercury.options:
extras/graphics/mercury_glfw/Mercury.options:
extras/graphics/mercury_glut/Mercury.options:
extras/graphics/mercury_glut/Mmakefile:
extras/graphics/mercury_glut/Mmakefile.MacOSX:
extras/graphics/mercury_opengl/Mercury.options:
extras/graphics/mercury_opengl/Mmakefile:
extras/graphics/mercury_opengl/Mmakefile.MacOSX:
extras/odbc/Mercury.options:
extras/odbc/Mmakefile:
extras/references/Mercury.options:
extras/solver_types/library/Mercury.options:
extras/solver_types/library/Mmakefile:
extras/trail/Mercury.options:
tests/submodules/Mercury.options:
tests/warnings/Mercury.options:
Replace all references to --warn-interface-imports with
--warn-unused-interface-imports, the new preferred name.
In several places, compiler options (both module-specific
and otherwise) were specified in Mmakefiles. Move them
to Mercury.options files. In some cases, this meant creating
new Mercury.options files.
69 lines
2.0 KiB
Makefile
69 lines
2.0 KiB
Makefile
#-----------------------------------------------------------------------------#
|
|
# vim: ts=8 sw=8 noexpandtab ft=make
|
|
#-----------------------------------------------------------------------------#
|
|
# Copyright (C) 1997-2000, 2003, 2006 The University of Melbourne.
|
|
# Copyright (C) 2015, 2020, 2022, 2025 The Mercury team.
|
|
# This file may only be copied under the terms of the GNU General
|
|
# Public License - see the file COPYING in the Mercury distribution.
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
# extras/odbc/Mmakefile - Mmake file for building the ODBC interface.
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
# Configuration
|
|
|
|
# The driver manager.
|
|
# Legal values for MODBC_DRIVER are MODBC_IODBC, MODBC_UNIX, and MODBC_MS.
|
|
# Feel free to add more (and handle them in odbc.m).
|
|
MODBC_DRIVER=MODBC_UNIX
|
|
|
|
# The database.
|
|
# Legal values for MODBC_DB are MODBC_MYSQL and MODBC_SQL_SERVER.
|
|
# Feel free to add more (and handle them in odbc.m).
|
|
MODBC_DB = MODBC_MYSQL
|
|
|
|
# Pathname for iODBC (only for MODBC_IODBC)
|
|
#IODBC_DIR=
|
|
|
|
# Pathname for the ODBC SDK (only for MODBC_MS)
|
|
ODBC_SDK_DIR=/odbcsdk
|
|
|
|
INSTALL_PREFIX := $(INSTALL_PREFIX)/extras
|
|
|
|
-include ../Mmake.params
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
ifeq ($(MODBC_DRIVER),MODBC_MS)
|
|
ODBC_INCL_DIR=$(ODBC_SDK_DIR)/include
|
|
MLLIBS=-lodbc32
|
|
else
|
|
#ODBC_LIB_DIR=$(IODBC_DIR)/lib
|
|
#ODBC_INCL_DIR=$(IODBC_DIR)/include
|
|
|
|
# The following are for Debian.
|
|
|
|
# for unixODBC
|
|
MLLIBS=-lodbc -lpthread -lltdl -ldl
|
|
|
|
# for iODBC
|
|
# MLLIBS=-liodbc -lpthread -ldl
|
|
# note: on a DEC Alpha using OSF1 remove the -ldl.
|
|
endif
|
|
|
|
MAIN_TARGET=odbc_test
|
|
|
|
.PHONY: depend
|
|
depend: odbc_test.depend
|
|
|
|
.PHONY: check
|
|
check:
|
|
true
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
|
|
MGNUCFLAGS=-D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
|
|
|
|
#-----------------------------------------------------------------------------#
|
|
#-----------------------------------------------------------------------------#
|