modified makefile and sensspeccommand files

[mothur.git] / makefile

diff --git a/makefile b/makefile
index af46fd97ab6bcd26392de438592e9d03678f3948..33cce4d996c4e9a586be09fa9096366658d1cb0f 100644 (file)
--- a/makefile
+++ b/makefile
@@ -17,7 +17,6 @@ CYGWIN_BUILD ?= no
 ifeq  ($(strip $(CYGWIN_BUILD)),yes)\r
     CXXFLAGS += -mno-cygwin\r
     LDFLAGS += -mno-cygwin \r
-#-lpsapi\r
 endif\r
 \r
 64BIT_VERSION ?= yes\r
@@ -35,8 +34,7 @@ ifeq  ($(strip $(USEREADLINE)),yes)
     CXXFLAGS += -DUSE_READLINE\r
     LDFLAGS += \\r
       -lreadline\\r
-      -lncurses\\r
-      -L../readline-6.0\r
+      -lncurses\r
 endif\r
 \r
 USEMPI ?= no\r
@@ -64,6 +62,12 @@ mothur : $(OBJECTS)
 install : mothur\r
        cp mothur ../Release/mothur\r
 \r
+%.o : %.cpp %.h\r
+       $(COMPILE.cpp) $(OUTPUT_OPTION) $<\r
+%.o : %.cpp %.hpp\r
+       $(COMPILE.cpp) $(OUTPUT_OPTION) $<\r
+\r
+\r
 clean :\r
        @rm -f $(OBJECTS)\r
 \r