X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FMakefile.in;h=561b1263af93d4bb6a9f1138e35e2e6d80d0d557;hp=fe89db5923981f3f52c035d8e21e7b7255aee2ba;hb=3d6725d5ac8805e56dbf32cf95e05326add68b17;hpb=8e5f65e9229d8ab54b3057505569061e856582d0

diff --git a/source/Makefile.in b/source/Makefile.in
index fe89db5..561b126 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -2,6 +2,7 @@ CPP=g++
 STRIP=strip
 CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
 CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
+MAKE=make
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -26,30 +27,6 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditor-Reset.o \
  contacteditor/frmContactEditor-Sound.o \
  contacteditor/frmContactEditor-Load.o \
- contacteditor/frmContactEditor-LoadAddress.o \
- contacteditor/frmContactEditor-LoadBADays.o \
- contacteditor/frmContactEditor-LoadCategory.o \
- contacteditor/frmContactEditor-LoadCalendar.o \
- contacteditor/frmContactEditor-LoadEmail.o \
- contacteditor/frmContactEditor-LoadGender.o \
- contacteditor/frmContactEditor-LoadGeo.o \
- contacteditor/frmContactEditor-LoadGroup.o \
- contacteditor/frmContactEditor-LoadIM.o \
- contacteditor/frmContactEditor-LoadKey.o \
- contacteditor/frmContactEditor-LoadLanguage.o \
- contacteditor/frmContactEditor-LoadLogo.o \
- contacteditor/frmContactEditor-LoadName.o \
- contacteditor/frmContactEditor-LoadNickname.o \
- contacteditor/frmContactEditor-LoadNote.o \
- contacteditor/frmContactEditor-LoadOrg.o \
- contacteditor/frmContactEditor-LoadPhoto.o \
- contacteditor/frmContactEditor-LoadRelated.o \
- contacteditor/frmContactEditor-LoadRole.o \
- contacteditor/frmContactEditor-LoadSound.o \
- contacteditor/frmContactEditor-LoadTelephone.o \
- contacteditor/frmContactEditor-LoadTimeZone.o \
- contacteditor/frmContactEditor-LoadTitle.o \
- contacteditor/frmContactEditor-LoadURL.o \
  contacteditor/frmContactEditor-Save.o \
  contacteditor/frmContactEditorNickname.o \
  contacteditor/frmContactEditorAddress.o \
@@ -73,10 +50,10 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditorKey.o \
  contacteditor/frmContactEditorVendor.o \
  contacteditor/frmContactEditorXToken.o
-CARDDAVOBJS=carddav/carddav.o carddav/carddav-connect.o \
- carddav/carddav-contactlist.o carddav/carddav-defaultadrurl.o \
- carddav/carddav-processdata.o carddav/carddav-servercontact.o \
- carddav/carddav-serveretag.o carddav/carddav-sslverify.o
+CDOOBJS=contacteditor/cdo/ContactDataObject.o \
+ contacteditor/cdo/ContactDataObject-Save.o
+CONNOBJS=connobject/ConnectionObject.o
+CARDDAV2OBJS=carddav2/carddav2.o
 COMMONOBJS=common/base64.o common/preferences.o common/getcontactinfo.o \
  common/etag.o common/textprocessing.o common/timers.o common/events.o \
  common/filename.o common/defaults.o common/uuid.o common/svrblist.o \
@@ -91,24 +68,32 @@ VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \
  vcard/vcard34conv-v4conv.o
 ACTMGROBJS=actmgr/frmActivityMgr.o actmgr/frmActivityMgr-tasks.o
 FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
- frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \
- frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \
- frmUpdate.o
+ frmNewAccount.o frmNewAccount-CardDAV2.o frmPreferences.o frmContact.o \
+ frmConflictResolution.o frmEditAccount.o frmInvalidSSLCertificate.o \
+ frmSSLCertificate.o frmUpdate.o
 WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
 BMCOOBJS=tools/bitmapcode.o
 
-xestiaab: bitmaphelper actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
-	carddavobjs ceobjs mainobjs searchobjs imexobjs 
-	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
-	$(CPPLIBS)
+default:
+	$(MAKE) bitmaphelper
+	$(MAKE) xestiaab
+
+xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
+	connobjs carddav2objs ceobjs cdoobjs mainobjs \
+	searchobjs imexobjs 
+	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
+	$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) \
+	$(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) $(CONNOBJS) $(CARDDAV2OBJS) \
+	-o $(XAB_OUT) $(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
 
 actmgrobjs: $(ACTMGROBJS)
 
-carddavobjs: $(CARDDAVOBJS)
+carddav2objs: $(CARDDAV2OBJS)
+
+connobjs: $(CONNOBJS)
 
 mainobjs: $(MAINOBJS)
 
@@ -118,6 +103,8 @@ vcardobjs: $(VCARDOBJS)
 
 ceobjs: $(CEOBJS)	
 
+cdoobjs: $(CDOOBJS)
+
 formobjs: $(FORMOBJS)
 
 searchobjs: $(SEARCHOBJS)
@@ -128,12 +115,14 @@ imexobjs: $(IMEXOBJS)
 
 clean:
 	rm -f $(XAB_OUT) $(BMCO_HELP) tools/bitmapcode.o *.o \
-	vcard/*.o common/*.o carddav/*.o contacteditor/*.o search/*.o \
-	widgets/*.o export/*.o import/*.o actmgr/*.o tests/$(XAB_OUT)_test \
-	tests/Temp*
+	vcard/*.o common/*.o contacteditor/*.o search/*.o \
+	widgets/*.o export/*.o import/*.o actmgr/*.o contacteditor/cdo/*.o \
+	tests/Temp* tests/*.o tests/classes/*.o connobject/*.o \
+	carddav2/*.o tests/$(XAB_OUT)_test
 
 distclean: clean
-	rm -f Makefile config.status config.log bitmapsdone \
+	rm -f Makefile tests/Makefile \
+	config.status config.log bitmapsdone \
 	tools/bitmapcode.helper bitmaps.h
 	find bitmaps -name "*.cpp" -type f -delete
 	find bitmaps -name "*.h" -type f -delete
@@ -147,9 +136,11 @@ bitmaphelper: bitmaphelperobjs
 
 install:
 	cp $(XAB_OUT) @BINDIR@/$(XAB_OUT)
+	cp xestiaab.1 @DATAROOTDIR@/man/man1/xestiaab.1
 
 uninstall:
 	rm @BINDIR@/$(XAB_OUT)
+	rm @DATAROOTDIR@/man/man1/xestiaab.1
 
 test:
-@GTEST@
+	@echo "To build and run the unit tests, run 'make' from the tests directory."