Commit Graph

26 Commits

Author SHA1 Message Date
Thomas Conway
e7d8f4f727 Change a couple of shell/make variable names,
Estimated hours taken: 0.5

Change a couple of shell/make variable names,
and moved some configuration stuff around.

scripts/Mmake.rules Mmake.vars.in:
	Changed some variable names.
	Changed a couple of configuration things for shared libraries.
1996-01-08 06:05:36 +00:00
Fergus Henderson
6aca62cff0 Change things so that in the usual case Mmake does not keep the
automatically generated `.c' files lying around.  (The aim of this
change is to cut down on disk space usage!)

scripts/Mmake.vars:
	Add `RM_C' variable to specify whether or not the `.c' files
	should be removed.

scripts/Mmake.rules:
	Add rule for creating `.o' files directly from the `.m' files,
	using $(RM_C) to delete the intermediate `.c' file.
1995-11-24 10:20:56 +00:00
Fergus Henderson
4c33b19f4c Fix bug in which mmake' would pass the same option twice to mc'.
Estimated hours taken: 0.3

Fix bug in which `mmake' would pass the same option twice to `mc'.

scripts/Mmake.rules
	When invoking `mc --make-interface', don't pass both
	$(MCFLAGS), since $(MCIFLAGS) already includes $(MCFLAGS).
1995-11-04 09:57:36 +00:00
Fergus Henderson
831dc0079c Add a rule for creating `.i' (pre-processed C) files.
scripts/Mmake.rules:
	Add a rule for creating `.i' (pre-processed C) files.
1995-10-24 07:29:21 +00:00
Fergus Henderson
d50a62a4d0 Fix the rule for making *.err: we now need to pass --errorcheck-only.
scripts/Mmake.rules:
	Fix the rule for making *.err: we now need to pass --errorcheck-only.
1995-07-18 13:10:29 +00:00
Fergus Henderson
a5860bfc01 Remove the actions for `mmake clean' etc., since they are now
scripts/Mmake.rules:
	Remove the actions for `mmake clean' etc., since they are now
	unnecessary (it's handled implicitly by adding dependencies
	in the .dep files).
1995-07-15 04:52:12 +00:00
Zoltan Somogyi
9f587aef89 Left out a backslash from last change. 1995-07-14 02:10:30 +00:00
Zoltan Somogyi
50afa2cec4 Work around sh bug which expands *.dep not to the empty string but
Mmake.rules:
	Work around sh bug which expands *.dep not to the empty string but
	to '*.dep' when there are no .dep files in the directory.
1995-07-14 02:09:01 +00:00
Fergus Henderson
2173043ee8 Fix quoting bug.
scripts/Mmake.rules:
	Fix quoting bug.
1995-07-13 17:16:34 +00:00
Fergus Henderson
dc876478be Don't define a rule for clean' and realclean', since those
Mmake.rules:
	Don't define a rule for `clean' and `realclean', since those
	are reserved for use by user Mmake files.  Instead, add a
	dependency on `sub_clean' and `sub_realclean', and define
	the rule there.
1995-07-13 01:40:41 +00:00
Zoltan Somogyi
da67857f42 Change --generate-code to --compile-to-c.
Mmake.vars:
	Change --generate-code to --compile-to-c.

Mmake.rules:
	Make the clean rule less reckless.
1995-07-12 15:28:26 +00:00
Fergus Henderson
e159b6a6c8 In the rule for making foo.depend, make sure to remove foo_init.c.
Mmake.rules:
	In the rule for making foo.depend, make sure to remove foo_init.c.
	This will ensure that it gets remade if necessary.
	(Previously this wasn't necessary since it always got remaid
	whenever any of the .m files changed.)
1995-06-20 07:07:24 +00:00
Zoltan Somogyi
7cabbb2000 Remove the redundant --compile-to-c from command lines.
Mmake.rules:
	Remove the redundant --compile-to-c from command lines.

sicstus_conv.in:
	Fix a bug that translated "\n" into not a newline but a newline
	and two tabs.
1995-06-14 12:13:32 +00:00
Fergus Henderson
ca8f2d6837 Remove rules for cleaning up *.mod.
Mmake.*:
	Remove rules for cleaning up *.mod.

mint.in:
	s/.nl/.m/
1995-05-29 15:29:05 +00:00
Fergus Henderson
4be01a3ad9 Remove support for the old .nl extension.
Mmake.rules:
	Remove support for the old .nl extension.
	Get rid of the rule for creating all those silly .nl -> .m symlinks.
	(You'll have to remove all those old symbolic links manually.)
1995-05-13 02:46:29 +00:00
Zoltan Somogyi
0f46c5d4e7 Merged in changes from the pass_str_branch. 1995-05-06 07:29:58 +00:00
Fergus Henderson
5909bded95 Add a rule for creating *.dep, identical to the .depend rule.
scripts/Mmake.rules:
	Add a rule for creating *.dep, identical to the .depend rule.
	(The .dep rule ensures that the .dep file exists; the .depend
	rule ensures that it is really up-to-date.)
1995-04-02 10:08:17 +00:00
Fergus Henderson
5df40b0d26 Add copyright notices.
scripts/*:
	Add copyright notices.
1995-03-28 15:35:15 +00:00
Fergus Henderson
f8189f3f01 Make sure the `clean' rule cleans up the *.pic_o files.
scripts/Mmake.rules:
	Make sure the `clean' rule cleans up the *.pic_o files.
1995-03-28 09:30:47 +00:00
Fergus Henderson
f998804c15 Add rules for creating .o_pic files by compiling with -fpic.
Mmake.{vars,rules}:
	Add rules for creating .o_pic files by compiling with -fpic.
	This is so we can create mix files compiled with -fpic for
	shared libraries with those compiled without -fpic (which are
	presumably more efficient) in the same directory.
1995-03-24 12:41:12 +00:00
Fergus Henderson
215c4c5bbe Use separate macros MCD, MCI, and MCG for making dependencies,
Mmake.rules, Mmake.vars:
	Use separate macros MCD, MCI, and MCG for making dependencies,
	interfaces, and generating code, along with MCDFLAGS, MCIFLAGS,
	and MCGFLAGS.
1995-03-24 05:09:22 +00:00
Fergus Henderson
1116b31484 We don't need to suppress the GNU Make builtin rules,
Mmake.rules:
	We don't need to suppress the GNU Make builtin rules,
	since mmake passes -r to make to suppress all the builtin rules.
	(The suppression wasn't compatible with Solaris make.)
1995-03-18 18:09:40 +00:00
Fergus Henderson
fe4760e23f Make the clean_s rule (rm -f *.s) user-configurable.
Mmake.rules:
	Make the clean_s rule (rm -f *.s) user-configurable.
1995-03-18 09:51:43 +00:00
Fergus Henderson
871c112dd9 Various changes to get things working with Sicstus Prolog.
scripts/*:
	Various changes to get things working with Sicstus Prolog.
1995-03-17 08:15:22 +00:00
Fergus Henderson
7dbe0bb601 Various changes to get things to work.
Makefile.common, Mmake.*:
	Various changes to get things to work.
	Handle both .m and .nl extensions.
	Added variables for SICStus Prolog.
1995-03-13 12:29:51 +00:00
Fergus Henderson
89360cdf4c Use mkdir -p.
Makefile.common:
	Use mkdir -p.

	Add mmake.sh.

	Change the tags rule so that it gets the .pp files first.

	Change the name of the compiler target from comp to mercury_compile.

	Remove the rules for test.exe since they duplicate the auto-generated
	ones in test.dep (which call the target `test' not `test.exe').

	Remove the `code_gen' target.  (Tom, if you need it, put it in
	Makefile.params.)

	Hack around with the installation rules (still in a state of flux).

options.nl:
	Disable the --mod-comments option by default.

llds.nl:
	Only output the gc livevals comment if --mod-comments is enabled.

mercury_compile.nl, prog_io.nl:
	Handle `file not found' errors more cleanly.
	When making the dependencies, assume that any files not found
	are library files, so don't put them in the dependencies.

modes.nl:
	Resolve type ambiguity introduced by change to prog_io.nl.

Mmake.rules Mmake.vars:
	Split Makefile.mercury into two halves for use by mmake.
	NOTE: I haven't removed Makefile.mercury yet, so any changes
	need to be made in both places!
1995-03-07 14:38:42 +00:00