X-Git-Url: http://Server1/repobrowser/?p=xestiacalendar%2F.git;a=blobdiff_plain;f=source%2FMakefile;h=7634f0387ccc5480f1632e884bf9a561aaf1777a;hp=42e9c68a5aeee426e164b20ce30e515e2184b97a;hb=0c16b6458c0fdc03b94288c17d7a685b95f122fc;hpb=fb2c90465d0ac5d2d8c3657ddf99d47db5639e51

diff --git a/source/Makefile b/source/Makefile
index 42e9c68..7634f03 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -1,7 +1,10 @@
 CPP=g++
 STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -Os
-CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
+BMCO_CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -I./common -ggdb
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 -I./common -ggdb
+BMCO_CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lxml2 -Llibraries -lCalendarDataStorage -lsqlite3
+CDSLIBS=-lsqlite3
 MAKE=make
 RM=rm
 
@@ -13,29 +16,95 @@ BMCO_DIR=../bitmaps
 
 MAINOBJS=main.o AppXestiaCalendar.o
 BMCOOBJS=tools/bitmapcode.o
-FORM_MAINOBJS=forms/main/frmMain.o
+COMMONOBJS=common/monthviewgen.o common/file.o common/text.o \
+ common/uuid.o common/preferences.o common/dirs.o common/defaults.o \
+ common/random.o common/svrblist.o
+FORM_MAINOBJS=forms/main/frmMain.o forms/main/frmMain-Window.o
+FORM_UPDATEOBJS=forms/update/frmUpdate.o
+FORM_EDITACCOUNTOBJS=forms/editaccount/frmEditAccount.o
+FORM_NEWACCOUNTOBJS=forms/newaccount/frmNewAccount.o
+FORM_CALENDAREDITOROBJS=forms/calendareditor/frmCalendarEditor.o
+FORM_EVENTEDITOROBJS=forms/eventeditor/frmEventEditor.o
+FORM_PREFERENCESOBJS=forms/preferences/frmPreferences.o
+FORM_ABOUTOBJS=forms/about/frmAbout.o
+WIDGETSOBJS=widgets/XCCalendarCtrl.o widgets/XCCalendarDay.o \
+ widgets/XCCalendarDayEntry.o widgets/XCCalendarMonthView.o \
+ widgets/XCCalendarMonthViewDayTitle.o \
+ widgets/XCCalendarManipulator.o \
+ widgets/XCCalendarMonthSelect.o \
+ widgets/XCCalendarList.o \
+ widgets/XCCalendarListAccountCtrl.o \
+ widgets/XCCalendarListCalendarCtrl.o \
+ widgets/XCCalendarMenu.o \
+ widgets/XCEventMenu.o
+CALENDARLISTOBJS=objects/calendarlist/CalendarList.o
+CALENDAROBJS=objects/calendarobject/CalendarObject-Save.o \
+ objects/calendarobject/CalendarObject.o
+CALENDAREVENTOBJS=objects/calendarevent/CalendarEvent-Save.o \
+ objects/calendarevent/CalendarEvent.o
+CDSOBJS=libraries/CalendarDataStorage/CalendarDataStorage.o
 
 default:
 	$(MAKE) bitmaphelper
+	$(MAKE) calendardatastorage
 	$(MAKE) xestiacal
 
-xestiacal: mainobjs form_mainobjs
-	$(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) \
+forms: form_mainobjs form_editaccountobjs form_newaccountobjs \
+	form_preferencesobjs form_aboutobjs form_updateobjs \
+	form_calendareditorobjs form_eventeditorobjs
+
+xestiacal: mainobjs forms widgetsobjs commonobjs calendarlistobjs calendarobjs calendareventobjs
+	$(CPP) -Os $(MAINOBJS) $(FORM_MAINOBJS) $(FORM_PREFERENCESOBJS) \
+	$(FORM_ABOUTOBJS) $(FORM_UPDATEOBJS) $(FORM_EDITACCOUNTOBJS) \
+	$(FORM_NEWACCOUNTOBJS) $(FORM_CALENDAREDITOROBJS) \
+	$(FORM_EVENTEDITOROBJS) \
+	$(WIDGETSOBJS) $(COMMONOBJS) $(CALENDARLISTOBJS) $(CALENDAROBJS) \
+	$(CALENDAREVENTOBJS) \
 	-o $(XCAL_OUT) $(CPPLIBS)
 
 bitmaphelperobjs: $(BMCOOBJS)
 
 bitmaphelper: bitmaphelperobjs
-	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
+	$(CPP) $(BMCO_CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(BMCO_CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 	
 clean:
-	$(RM) -rf *.o
+	find . -name "*.o" -type f -delete
+	find . -name "*.a" -type f -delete
+	$(RM) -f ./xestiacal
 	
 mainobjs: $(MAINOBJS)
 
 form_mainobjs: $(FORM_MAINOBJS)
+
+form_updateobjs: $(FORM_UPDATEOBJS)
+
+form_editaccountobjs: $(FORM_EDITACCOUNTOBJS)
+
+form_newaccountobjs: $(FORM_NEWACCOUNTOBJS)
+
+form_calendareditorobjs: $(FORM_CALENDAREDITOROBJS)
+
+form_eventeditorobjs: $(FORM_EVENTEDITOROBJS)
+
+form_preferencesobjs: $(FORM_PREFERENCESOBJS)
+
+form_aboutobjs: $(FORM_ABOUTOBJS)
+
+widgetsobjs: $(WIDGETSOBJS)
 	
+commonobjs: $(COMMONOBJS)
+
+calendarlistobjs: $(CALENDARLISTOBJS)
+
+calendarobjs: $(CALENDAROBJS)
+
+calendareventobjs: $(CALENDAREVENTOBJS)
+
+calendardatastorage: 
+	g++ -c -ggdb --std=c++11 libraries/CalendarDataStorage/CalendarDataStorage.cpp -o libraries/CalendarDataStorage/CalendarDataStorage.o -lsqlite3
+	ar rcs libraries/libCalendarDataStorage.a libraries/CalendarDataStorage/CalendarDataStorage.o
+
 test:
 	cd tests
 	g++ `xml2-config --cflags --libs` -ggdb --std=c++11 -lcurl -lgtest -pthread xestiacalendar_test.cpp xestiacalendar_testcommon.cpp ../objects/calendarevent/CalendarEvent.cpp ../objects/calendartask/CalendarTask.cpp ../objects/calendarjournal/CalendarJournal.cpp ../objects/calendarfreebusy/CalendarFreeBusy.cpp ../objects/calendartimezone/CalendarTimezone.cpp ../objects/calendarobject/CalendarObject.cpp ../common/file.cpp ../common/text.cpp ../objects/CalDAV/CalDAV.cpp ../objects/CalDAV/CalDAV-XMLProcessing.cpp -o xestiacalendar_test