Modified Eos/Makefile

diff --git a/Makefile b/Makefile
index 6ff29ec..d118dd0 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,48 @@
 EOS_GIT_BACKUPSITE=/net/fs08/fs08/DataBase/EosBackup.git
 EOS_GIT_REPOSITRY= git.sourceforge.jp:/gitroot/eos/base.git 
+EOS_GIT_REPOSITRY_OPTIONAL= git.sourceforge.jp:/gitroot/eos/optional.git 
+EOS_GIT_REPOSITRY_TUTORIAL= git.sourceforge.jp:/gitroot/eos/tutorial.git 
+EOS_GIT_REPOSITRY_DATA= git.sourceforge.jp:/gitroot/eos/data.git 
+
+
+help::
+       @echo ">> Help"
+       @echo ">>>> Download"
+       @echo "---- To register new/Modified source codes. ----"
+       @echo " $$ git add         or git add[-all|-data|-tutorial|-optional]" 
+       @echo " $$ git commit      or git commit[-all|-data|-tutorial|-optional]" 
+       @echo " $$ git push        or git push[-all|-data|-tutorial|-optional]" 
+       @echo ""
+       @echo "---- To fetch and merge new/modified source codes. ----" 
+       @echo " $$ git fetch       or git fetch[-all|-data|-tutorial|-optional]" 
+       @echo " $$ git merge       or git merge[-all|-data|-tutorial|-optional]" 
+       @echo ""
+       @echo "---- To init git repository ----"
+       @echo " $$ git init        or git init[-all|-data|-tutorial|-optional]" 
+       @echo ""
+       @echo "---- option ----"
+       @echo "     [] : base only"
+       @echo "     [-data]     : data (for test)"
+       @echo "     [-tutorial] : tutorial"
+       @echo "     [-optional] : optional(for documents)"
+       @echo "     [-all] : all"
+       @echo "     [-all] : all"
+       @echo ""
+       @echo ">>>> Rebuild"
+       @echo "----------------"
+       @echo "---- To rebuild source codes of Eos ----"
+       @echo " $$ make rebuild"
+
+
+rebuild: rebuild-Objects rebuild-Tools
+
+rebuild-Objects:
+       cd src/Objects;  make check; make depend; make ; make install
+
+rebuild-Tools:
+       cd src/Tools;    make check; make depend; make ; make install
+
+git-add-all:: git-add git-add-data git-add-optional git-add-tutorial
 
 git-add::
        git add Makefile
@@ -13,27 +56,95 @@ git-add::
        git add util
        git add hostdepend
 
+
 git-add-optional::
-       git add data
+       cd optional; git add . 
+
+git-add-data::
+       cd data; git add . 
+
+git-add-tutorial::
+       cd tutorial; git add . 
+
+git-commit-all:: git-commit git-commit-data git-commit-optional git-commit-tutorial
 
 git-commit::
-       echo "Message"; read MESSAGE; echo $$MESSAGE ; \
-       git commit -m "$$MESSAGE" 
+       git commit 
+
+git-commit-optional::
+       cd optional; git commit  
+
+git-commit-data::
+       cd data; git commit 
+
+git-commit-tutorial::
+       cd tutorial; git commit 
 
 git-backup::
        git push $(EOS_GIT_BACKUPSITE) master 
 
+git-push-all:: git-push git-push-data git-push-optional git-push-tutorial
+
 git-push::
-       #git push $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY) master
        git push origin master 
 
-git-pull::
-       #git pull $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY) master 
-       git pull origin master
+git-push-optional::
+       cd optional; git push optional master 
+
+git-push-data::
+       cd data; git push data master 
+
+git-push-tutorial::
+       cd tutorial; git push tutorial master 
+
+git-fetch-all:: git-fetch git-fetch-data git-fetch-optional git-fetch-tutorial
+
+git-fetch::
+       git fetch origin master ; git log
+
+git-fetch-data::
+       cd data ; git fetch data master; git log 
+
+git-fetch-optional::
+       cd optional; git fetch optional master; git log
+
+git-fetch-tutorial::
+       cd tutorial; git fetch tutorial master; git log
+
+git-merge-all:: git-merge git-merge-data git-merge-optional git-merge-tutorial
+
+git-merge::
+       git log; git merge origin master 
+
+git-merge-data::
+       cd data    ; git log; git merge data master
+
+git-merge-optional::
+       cd optional; git log; git merge optional master
+
+git-merge-tutorial::
+       cd tutorial; git log; git merge tutorial master
+
+#
+# Nickname 
+#
+
+git-init-all:: git-init git-init-data git-init-optional git-init-tutorial
 
 git-init::
-       git remote add origin $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY)
+       git remote add origin    $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY)
 
-git-add-tutorial::
-       git add tutorials
+git-init-data::
+       if [ ! -d data ] ; then mkdir data; fi
+       cd data; git remote add data      $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY_DATA)
+
+git-init-optional::
+       if [ ! -d optional ] ; then mkdir tutorial ; fi
+       if [ ! -L doc      ] ; then ln -sf optional/doc . ; fi
+       if [ ! -L objects  ] ; then ln -sf optional/objects . ; fi
+       cd optional; git remote add optional  $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY_OPTIONAL)
+
+git-init-tutorial::
+       if [ ! -d tutorial ] ; then mkdir tutorial ; fi
+       cd tutorial; git remote add tutorial  $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY_TUTORIAL)