moved cpint code into gui dir

src/Makefile

@@ -18,7 +18,7 @@
 # Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-SUBDIRS=lib cpint cmd srm gui # order is important!
+SUBDIRS=lib srm gui cmd # order is important!
 
 all: qmakefiles subdirs 
 .PHONY: all qmakefiles subdirs clean

src/cmd/Makefile

@@ -23,14 +23,19 @@ QT=$(subst /bin/qmake,,$(shell which qmake))
 CC=gcc
 CFLAGS=-g -W -Wall -Werror -ansi -pedantic -std=c99
 CMDS=ptdl ptpk ptunpk cpint
-LIBS=../lib/libgc.a ../cpint/libcpint.a ../srm/libsrm.a
+GUIOBJ=../gui/cpint.o \
+	../gui/RideFile.o \
+	../gui/CsvRideFile.o \
+	../gui/SrmRideFile.o \
+	../gui/RawRideFile.o
+LIBS=../lib/libgc.a ../srm/libsrm.a
 LIBRARIES=-lm
 ifeq ($(OS),Darwin)
   LIBRARIES+=-lm -F$(QT)/lib -framework QtCore
 else
   LIBRARIES+=-L$(QT)/lib -lQtCore
 endif
-INCLUDES=-I../lib -I../cpint
+INCLUDES=-I../lib -I../gui
 
 all: $(CMDS)
 .PHONY: all clean
@@ -42,7 +47,7 @@ clean:
 	$(CC) -c $(CFLAGS) $(INCLUDES) $< 
 
 cpint: cpint.o $(LIBS)
-	$(CXX) -o $@ $^ $(LIBS) $(LIBRARIES)
+	$(CXX) -o $@ $^ $(GUIOBJ) $(LIBS) $(LIBRARIES)
 
 ptdl: ptdl.o $(LIBS)
 	$(CC) -o $@ $^ $(LIBRARIES)

src/cpint/cpint.pro

@@ -1,16 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) Sun Apr 8 17:19:06 2007
-######################################################################
-
-TEMPLATE = lib
-TARGET = 
-DEPENDPATH += . ../gui
-INCLUDEPATH += . ../lib ../srm ../gui
-
-CONFIG += static debug
-LIBS += -lm
-
-# Input
-HEADERS += cpint.h
-SOURCES += cpint.cpp
-

src/gui/GoldenCheetah.pro

@@ -5,10 +5,10 @@
 TEMPLATE = app
 TARGET += 
 DEPENDPATH += .
-INCLUDEPATH += /usr/local/qwt/include ../lib ../srm ../cpint
+INCLUDEPATH += /usr/local/qwt/include ../lib ../srm
 CONFIG += static debug
 LIBS += /usr/local/qwt/lib/libqwt.a 
-LIBS += ../lib/libgc.a ../cpint/libcpint.a ../srm/libsrm.a
+LIBS += ../lib/libgc.a ../srm/libsrm.a
 LIBS += -lm -lz
 macx {
     LIBS += -framework Carbon
@@ -33,7 +33,8 @@ HEADERS += \
 	RideItem.h \
 	SrmRideFile.h \
 	TimeUtils.h \
-        Zones.h
+        Zones.h \
+	cpint.h
 
 SOURCES += \
 	AllPlot.cpp \
@@ -53,5 +54,6 @@ SOURCES += \
 	SrmRideFile.cpp \
         TimeUtils.cpp \
         Zones.cpp \
+	cpint.cpp \
 	\
 	main.cpp