Fixed some little typos in v0.2.2

diff --git a/ChangeLog b/ChangeLog
index 467c507..aae4a8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -56,7 +56,8 @@ Code cleanup:
   to warrant the additional "complexity" :)).
 
 Miscellaneous improvements:
-* Now compiles also with MS Visual C++ and with GCC under cygwin.
+* Now compiles also with MS Visual C++ (thanks to Jiuxiang Hu) and with 
+  GCC under cygwin.
 * Contributions by Peter Gober:
   - Renamed variable _N in mr.* for compatibility with g++ under cygwin.
 * Misc contributions by Giuseppe Passino:

diff --git a/Makefile b/Makefile
index 930431f..4adbaff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -65,7 +65,7 @@ CCFLAGS:=$(CCFLAGS) -g -DDAI_DEBUG
 endif
 
 ifdef WINDOWS
-CCFLAGS=$(CCFLAGS) -DWINDOWS
+CCFLAGS:=$(CCFLAGS) -DWINDOWS
 endif
 
 OBJECTS:=exactinf$(OE)

diff --git a/Makefile.shared b/Makefile.shared
index a131922..581a07b 100644 (file)
--- a/Makefile.shared
+++ b/Makefile.shared
@@ -78,14 +78,14 @@ alldai$(OE) : $(SRC)/alldai.cpp $(HEADERS)
 ##########
 
 example$(EE) : example.cpp $(HEADERS) $(LIB)/libdai$(LE)
-       $(CC) $(CCFLAGS) $(CCO) example$(EE) example.cpp $(LIBS)
+       $(CC) $(CCFLAGS) $(CCO)example$(EE) example.cpp $(LIBS)
 
 
 # TESTS
 ########
 
 tests/testdai$(EE) : tests/testdai.cpp $(HEADERS) $(LIB)/libdai$(LE)
-       $(CC) $(CCFLAGS) $(CCO) tests/testdai$(EE) tests/testdai.cpp $(LIBS) $(BOOSTLIBS)
+       $(CC) $(CCFLAGS) $(CCO)tests/testdai$(EE) tests/testdai.cpp $(LIBS) $(BOOSTLIBS)
 
 
 # MATLAB INTERFACE
@@ -111,10 +111,10 @@ matlab/matlab$(OE) : matlab/matlab.cpp matlab/matlab.h $(HEADERS)
 ########
 
 utils/createfg$(EE) : utils/createfg.cpp $(HEADERS) $(LIB)/libdai$(LE)
-       $(CC) $(CCFLAGS) $(CCO) utils/createfg$(EE) utils/createfg.cpp $(LIBS) $(BOOSTLIBS)
+       $(CC) $(CCFLAGS) $(CCO)utils/createfg$(EE) utils/createfg.cpp $(LIBS) $(BOOSTLIBS)
 
 utils/fg2dot$(EE) : utils/fg2dot.cpp $(HEADERS) $(LIB)/libdai$(LE)
-       $(CC) $(CCFLAGS) $(CCO) utils/fg2dot$(EE) utils/fg2dot.cpp $(LIBS)
+       $(CC) $(CCFLAGS) $(CCO)utils/fg2dot$(EE) utils/fg2dot.cpp $(LIBS)
 
 utils/fginfo$(EE) : utils/fginfo.cpp $(HEADERS) $(LIB)/libdai$(LE)
-       $(CC) $(CCFLAGS) $(CCO) utils/fginfo$(EE) utils/fginfo.cpp $(LIBS)
+       $(CC) $(CCFLAGS) $(CCO)utils/fginfo$(EE) utils/fginfo.cpp $(LIBS)

diff --git a/Makefile.win b/Makefile.win
index e275be4..ec700eb 100755 (executable)
--- a/Makefile.win
+++ b/Makefile.win
@@ -133,7 +133,7 @@ tests : tests/testdai$(EE)
 \r
 utils : utils/createfg$(EE) utils/fg2dot$(EE) utils/fginfo$(EE)\r
 \r
-testregression : tests/testdai\r
+testregression : tests/testdai$(EE)\r
        echo Testing...this can take a while...\r
        cd tests; time ./testregression; cd ..\r
 \r

diff --git a/README b/README
index 7b642da..bc283ba 100644 (file)
--- a/README
+++ b/README
@@ -15,6 +15,8 @@ Giuseppe Passino
 Christian Wojek
 Claudio Lima
 Bastian Wemmenhove
+Jiuxiang Hu
+Peter Gober
 
 
 ----------------------------------------------------------------------------------