In the patch attached (made against 3.6.19rc1), a few extra small 
makefile corrections:

1) ratings.ssp was not installed and uninstalled. Now it is

2) old-install target was removed (whatever it was, it was not 
maintained)

3) Additional makefile targets were added
   make all_scid
   make install_scid
(which build and install scid without engines) and
  make all_engines
  make install_engines
(which build and install engines only)

Of course both
    make
    make install
work as usual building both scid and engines

{ those are mostly useful for people who frequently recompile 
scid, engines change rarely but compiling them takes time, also 
people who do not use those engines but prefer sth else can use 
this option }

4) Submakefiles are called using $(MAKE). Thanks to it, if one 
issues
     make -j 2
to utilize multicore or multicpu machine for compilation, also 
engines are compiled with this setting active.
Dodane opcje all_scid/all_engines i install_scid/install_engines.

diff --git a/Makefile.conf b/Makefile.conf
--- a/Makefile.conf
+++ b/Makefile.conf
@@ -214,26 +214,42 @@ SCRIPTS= sc_addmove sc_epgn sc_spell sc_
 
 ### Type "make" or "make all" to make all programs:
 #
-all: scid $(SCRIPTS) $(EXECS) crafty phalanx toga
+all: all_scid all_engines
+
+all_scid: scid $(SCRIPTS) $(EXECS)
+
+all_engines: crafty phalanx toga
 
 crafty: 
-	cd engines/crafty-20.14/ && make linux && cd ../../
+	cd engines/crafty-20.14/ && $(MAKE) linux && cd ../../
 
 phalanx:
-	cd engines/Phalanx-XXII/ && make && cd ../../
+	cd engines/Phalanx-XXII/ && $(MAKE) && cd ../../
 
 toga:
-	cd engines/togaII1.2.1a/src/ && make && cd ../../
+	cd engines/togaII1.2.1a/src/ && $(MAKE) && cd ../../
 
 ### To copy all executables to $BINDIR, with read and execute permission 
 #   for all users, and put extra files in $SHAREDIR, type "make install".
 #
-install: all
+
+install: install_scid install_engines
+
+install_scid: all_scid
+	install -m 755 -d $(SHAREDIR)
 	install -m 755 -d $(BINDIR)
-	install -m 755 -d $(SHAREDIR)
 	install -m 755 -d $(SHAREDIR)/data/
 	install -m 755 scid $(SCRIPTS) $(EXECS) $(BINDIR)
-	install -m 644 -p scid.eco spelling.ssp $(SHAREDIR)/data/
+	install -m 644 -p scid.eco spelling.ssp ratings.ssp $(SHAREDIR)/data/
+	install -m 755 -d $(SHAREDIR)/books
+	install -m 666 ./books/* $(SHAREDIR)/books/
+	install -m 755 -d $(SHAREDIR)/bases
+	install -m 666 ./bases/* $(SHAREDIR)/bases/
+	install -m 755 -d $(SHAREDIR)/html
+	cp -r ./html/* $(SHAREDIR)/html/
+	chmod -R 0777 $(SHAREDIR)/html/*
+
+install_engines: all_engines
 	install -m 755 -d $(SHAREDIR)/engines
 	install -m 755 -d $(SHAREDIR)/engines/crafty-20.14
 	install ./engines/crafty-20.14/crafty $(SHAREDIR)/engines/crafty-20.14/
@@ -242,20 +258,13 @@ install: all
 	install ./engines/Phalanx-XXII/phalanx $(SHAREDIR)/engines/Phalanx-XXII
 	install -m 755 -d $(SHAREDIR)/engines/togaII1.2.1a
 	install ./engines/togaII1.2.1a/src/fruit $(SHAREDIR)/engines/togaII1.2.1a/
-	install -m 755 -d $(SHAREDIR)/books
-	install -m 666 ./books/* $(SHAREDIR)/books/
-	install -m 755 -d $(SHAREDIR)/bases
-	install -m 666 ./bases/* $(SHAREDIR)/bases/
-	install -m 755 -d $(SHAREDIR)/html
-	cp -r ./html/* $(SHAREDIR)/html/
-	chmod -R 0777 $(SHAREDIR)/html/*
 
 uninstall:
 	rm -rf $(SHAREDIR)/engines
 	rm -rf $(SHAREDIR)/books
 	rm -rf $(SHAREDIR)/bases
 	rm -rf $(SHAREDIR)/data/
-	rm -f $(SHAREDIR)/data/scid.eco $(SHAREDIR)/data/spelling.ssp
+	rm -f $(SHAREDIR)/data/scid.eco $(SHAREDIR)/data/spelling.ssp $(SHAREDIR)/data/ratings.ssp
 	rm -f $(BINDIR)/scid $(BINDIR)/sc_addmove $(BINDIR)/sc_epgn
 	rm -f $(BINDIR)/sc_spell $(BINDIR)/sc_eco $(BINDIR)/sc_import
 	rm -f $(BINDIR)/sc_remote $(BINDIR)/sc_tree $(BINDIR)/scidpgn
@@ -264,15 +273,6 @@ uninstall:
 	rm -f $(BINDIR)/scmerge $(BINDIR)/scidlet
 	rm -rf $(SHAREDIR)/html
 	
-old-install: all
-	chmod 755 scid $(SCRIPTS) $(EXECS)
-	cp scid $(SCRIPTS) $(EXECS) $(BINDIR)
-	-mkdir -p $(SHAREDIR)
-	-chmod a+rx $(SHAREDIR)
-	-cp ./scid.eco $(SHAREDIR)/scid.eco
-	-cp ./spelling.ssp $(SHAREDIR)/spelling.ssp
-	-chmod a+r $(SHAREDIR)/scid.eco $(SHAREDIR)/spelling.ssp
-
 ### To remove Scid files placed in the BINDIR and SHAREDIR directories,
 #   type "make distclean".
 #
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Scid-users mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/scid-users

Reply via email to