fix wild usage of IOClone in Timer/Gregorian.c

jameskermode · May 13, 2015 · 1a30480 · 1a30480
1 parent 15d85b9
commit 1a30480
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/Makefile.atomeye b/Makefile.atomeye
@@ -32,7 +32,6 @@ ALLSUBDIRS = ${SUBDIRS} A3
 
 subdirs:
 	for dir in ${SUBDIRS}; do \
-	  cp $$dir/*.h include; \
 	  $(MAKE) -C $$dir || exit 1; \
 	done
 	$(MAKE) -C A3 i || exit 1

diff --git a/Timer/Gregorian.c b/Timer/Gregorian.c
@@ -7,6 +7,7 @@
 /**************************************/
 
 #include "Timer.h"
+#include <IO.h>
 
 /**********************/
 /* Gregorian Calendar */
@@ -24,7 +25,7 @@ double datenummx (GregorianDate *G)
     if ((G->month < 1) || (G->month > 12))
         printf ("datenummx: month = %d\n", G->month);
     result = 365.*G->year + ceil(G->year/4.) -
-        ceil(G->year/100.) + ceil(G->year/400.) + 
+        ceil(G->year/100.) + ceil(G->year/400.) +
         cdm[G->month-1] + G->day;
     if (G->month > 2)
     {
@@ -90,11 +91,11 @@ static double cdml[] = {0,31,60,91,121,152,182,213,244,274,305,335,366};
 
 /* Calculate date components from serial date number */
 void datevecmx (double datenum, GregorianDate *G)
-{ 
-    double *cdm; 
+{
+    double *cdm;
     double ts, y;
     int iy, leap, mon;
-    
+
     datenum = 86400*datenum;
     if (1)
     {

diff --git a/Timer/Makefile b/Timer/Makefile
@@ -30,7 +30,7 @@ MY_BAK_DIR = ../bak
 USE_MY_LIB = \
    -lAX -lAtoms -lVecMat3 -lVecMat -lIO -lScalar -lTimer
 
-CFLAGS = -D_$(SYS) ${CCFLAGS} -I${MY_INC_DIR}
+CFLAGS = -D_$(SYS) ${CCFLAGS} -I${MY_INC_DIR} -I../IO
 LDFLAGS = ${SYSTEM_LIB_FLAG} ${USE_SYSTEM_LIB} -L${MY_LIB_DIR} ${USE_MY_LIB}
 
 .PHONY: all  i install  c clean  b backup  r  g  h  a access