with '#' will be ignored, and an empty message aborts the commit.
On branch master
Your branch is behind 'origin/master' by 12 commits, and can be fast-forwarded.
(use "git pull" to update your local branch)
Changes to be committed:
modified: src/Config/x86Mac64.inc
modified: src/Objects/Makefile
modified: src/Tools/filter/mrc2hdf/src/Makefile
modified: src/Tools/filter/mrc2hdf/src/mrc2hdf.html
new file: src/Tools/filter/mrc2hdf/src/test/Makefile
new file: src/Tools/filter/mrc2hdf/src/test/data
modified: util/src/DataFormat/Makefile
#CCOPTSDEBUG = -O2 -pipe -march=nocona -g $(EXTRA_DEFINE) $(ARCHTYPE) \
# -I$(EOS_HOME)/util/$(OSTYPE)/include
-CCOPTS = -O2 -pipe $(EXTRA_DEFINE) $(ARCHTYPE) \
- -I$(EOS_HOME)/util/$(OSTYPE)/include
-CCOPTSDEBUG = -pipe -g $(EXTRA_DEFINE) $(ARCHTYPE) \
- -I$(EOS_HOME)/util/$(OSTYPE)/include
+CCOPTS = -O2 -pipe $(EXTRA_DEFINE) $(ARCHTYPE) -I$(EOS_HOME)/util/$(OSTYPE)/include
+CCOPTSDEBUG = -pipe -g $(EXTRA_DEFINE) $(ARCHTYPE) -I$(EOS_HOME)/util/$(OSTYPE)/include
AR = /usr/bin/ar
@if [ -f $(OBJECTNAME).c ] ; \
then \
echo "dependency: *.c"; \
- echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c ; \
- $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c >> $(OSTYPE)/.Depend ; \
+ echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.c ; \
+ $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.c >> $(OSTYPE)/.Depend ; \
fi
#echo CC
@if [ -f $(OBJECTNAME).cc ] ; \
-/bin/bash: mrc2hdf: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrc2hdf</TITLE>
+</HEAD>
+<BODY>
+<H1>mrc2hdf</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrc2hdf
+Options:
+ [-i[nput] In (NULL ).as(inFile ) ] :Essential :InputDataFile
+ [-o[utput] Out (NULL ).as(outFile ) ] :Essential :OutputDataFile
+ [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
+ [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>
--- /dev/null
+include ../../Config/Define.inc
+include ../../../Config/Define.inc
+include ../../../../Config/Define.inc
+include ../../../../../Config/Define.inc
+
+all: help exec
+
+help:
+ @echo "----- Help Message Check -----"
+ @../$(OSTYPE)/$(OBJECTNAME) -h
+
+exec:
+ @echo "----- Execution Check -----"
+ ../$(OSTYPE)/$(OBJECTNAME)
+ @echo "----- Calc check -----"
+
+clean:
--- /dev/null
+../../../../../..//data/mrc2hdf
\ No newline at end of file
HDF5-VERSION=1.12.0
HDF5-VERSION2=1-12-0
+help::
+ @echo "HDF5:"
+ @echo " $ make init-hdf5"
+ @echo " $ make config-hdf5"
+ @echo " $ make all-hdf5"
+ @echo " $ make clean-hdf5"
+ @echo " $ make cleanAll-hdf5"
+
init:: init-hdf5
config:: config-hdf5
clean:: clean-hdf5