trivial diff: remove `lp_solve'

Fergus Henderson fjh at cs.mu.oz.au
Wed Oct 22 00:53:25 AEST 1997


.README.in:
Mmakefile:
bindist/Mmakefile:
bindist/bindist.Mmakefile.in:
tools/bootcheck:
	Delete all references to `lp_solve'. It is not needed anymore,
	now that we have written our own solver.

cvs diff  .README.in Mmakefile bindist/Mmakefile bindist/bindist.Mmakefile.in tools/bootcheck
Index: .README.in
===================================================================
RCS file: /home/staff/zs/imp/mercury/.README.in,v
retrieving revision 1.4
diff -u -r1.4 .README.in
--- .README.in	1997/10/09 14:04:08	1.4
+++ .README.in	1997/10/21 14:40:15
@@ -15,8 +15,7 @@
 those files.  A few files (config*) are derived from code that is
 copyright by the Free Software Foundation, Inc.  The program `texi2html'
 in the doc directory is copyright by CERN; see the copyright notice at
-the end of that file.  The subdirectory `lp_solve' contains a linear
-programming solver by Michel Berkelaar; see the file lp_solve/COPYING.
+the end of that file.
 
 Some of the files in the `extras' subdirectory have fairly restrictive
 copyright licences.  The `Togl' library in extras/graphics/Togl-1.2
Index: Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/Mmakefile,v
retrieving revision 1.12
diff -u -r1.12 Mmakefile
--- Mmakefile	1997/10/15 15:55:10	1.12
+++ Mmakefile	1997/10/21 14:37:05
@@ -13,7 +13,7 @@
 
 #-----------------------------------------------------------------------------#
 
-SUBDIRS = scripts util boehm_gc runtime library compiler doc profiler lp_solve
+SUBDIRS = scripts util boehm_gc runtime library compiler doc profiler
 
 SUBDIR_MMAKE =	PATH=../scripts:../util:$$PATH \
 		MMAKE_VPATH=. \
@@ -111,10 +111,6 @@
 profiler: dep_profiler scripts util runtime boehm_gc library
 	cd profiler && $(SUBDIR_MMAKE)
 
-.PHONY: lp_solve
-lp_solve:
-	-cd lp_solve && $(SUBDIR_MMAKE)
-
 #-----------------------------------------------------------------------------#
 
 .PHONY: tags
@@ -190,6 +186,7 @@
 		mkdir stuff-to-exclude;					\
 		mv mercury-$(VERSION)/trial	stuff-to-exclude;	\
 		mv mercury-$(VERSION)/bytecode	stuff-to-exclude;	\
+		mv mercury-$(VERSION)/lp_solve	stuff-to-exclude;	\
 		mv mercury-$(VERSION)/extras mercury-$(VERSION)-extras; \
 		tar -cf - mercury-$(VERSION) |				\
 			gzip -9 > mercury-$(VERSION).tar.gz;		\
@@ -211,7 +208,7 @@
 .PHONY: install
 install: all install_scripts install_util install_runtime install_boehm_gc \
 		install_library install_compiler install_profiler install_doc \
-		install_grades install_lp_solve
+		install_grades
 
 .PHONY: install_scripts
 install_scripts: scripts
@@ -299,10 +296,6 @@
 	        rm -rf *.dir *.c *.o *.pic_o *.a *.so; \
 	done && \
 	{ mv tmp_dir/* . ; rmdir tmp_dir; true; }
-
-.PHONY: install_lp_solve
-install_lp_solve: lp_solve
-	-cd lp_solve && $(SUBDIR_MMAKE) install
 
 #-----------------------------------------------------------------------------#
 
Index: bindist/Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/bindist/Mmakefile,v
retrieving revision 1.7
diff -u -r1.7 Mmakefile
--- Mmakefile	1997/10/09 14:04:17	1.7
+++ Mmakefile	1997/10/21 14:47:30
@@ -18,8 +18,7 @@
 
 UTILS		= $(INSTALL_PREFIX)/bin/mkinit \
 		  $(INSTALL_PREFIX)/bin/mdemangle \
-		  $(INSTALL_PREFIX)/bin/mtags \
-		  $(INSTALL_PREFIX)/bin/lp_solve
+		  $(INSTALL_PREFIX)/bin/mtags
 
 README_ETC	= ../COPYING ../COPYING.LIB ../HISTORY ../LIMITATIONS \
 		  ../NEWS ../RELEASE_NOTES ../BUGS ../WORK_IN_PROGRESS \
cvs diff: I know nothing about bindist/bindist.Mmakefile.in
Index: tools/bootcheck
===================================================================
RCS file: /home/staff/zs/imp/mercury/tools/bootcheck,v
retrieving revision 1.42
diff -u -r1.42 bootcheck
--- bootcheck	1997/10/11 03:27:26	1.42
+++ bootcheck	1997/10/21 14:38:32
@@ -196,7 +196,6 @@
 	ln -s $root/scripts .
 	ln -s $root/util .
 	ln -s $root/profiler .
-	ln -s $root/lp_solve .
 	ln -s $root/conf* .
 	ln -s $root/VERSION .
 	ln -s $root/.README.in .
@@ -358,7 +357,6 @@
 ln -s $root/scripts .
 ln -s $root/util .
 ln -s $root/profiler .
-ln -s $root/lp_solve .
 ln -s $root/conf* .
 ln -s $root/VERSION .
 ln -s $root/.README.in .
@@ -469,7 +467,6 @@
 ln -s $root/scripts .
 ln -s $root/util .
 ln -s $root/profiler .
-ln -s $root/lp_solve .
 ln -s $root/conf* .
 ln -s $root/VERSION .
 ln -s $root/.README.in .
-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.



More information about the developers mailing list