X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=ea4e3b1ae1ba6fd08f4e0d3eee480f5bf2f33e7d;hb=5e0d4aba3979404f08a3f864fffb61889d057278;hp=272370e3ec811d8ec371b40cc89ca2f6792ce032;hpb=3bd48376ad42f7f992078041895a3a32d37a5909;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index 272370e..ea4e3b1 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,6 +1,7 @@
 CPP=g++
 STRIP=strip
-CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags` -std=c++11 @DBGOUT@
+CPPLIBS=`wx-config --libs` `curl-config --libs` -lsfml-audio -lxml2
 
 @DBGSTATUS@
 XAB_OUT=xestiaab
@@ -10,7 +11,46 @@ BMCO_DIR=../bitmaps
 
 MAINOBJS=main.o
 CEOBJS=contacteditor/frmContactEditor.o \
+ contacteditor/frmContactEditor-Business.o \
+ contacteditor/frmContactEditor-Calendar.o \
+ contacteditor/frmContactEditor-Category.o \
+ contacteditor/frmContactEditor-Events.o \
+ contacteditor/frmContactEditor-General.o \
+ contacteditor/frmContactEditor-Groups.o \
+ contacteditor/frmContactEditor-Home.o \
+ contacteditor/frmContactEditor-Init.o \
+ contacteditor/frmContactEditor-Key.o \
+ contacteditor/frmContactEditor-Logo.o \
+ contacteditor/frmContactEditor-Other.o \
+ contacteditor/frmContactEditor-Picture.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 \
  contacteditor/frmContactEditorEmail.o \
@@ -33,7 +73,10 @@ CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditorKey.o \
  contacteditor/frmContactEditorVendor.o \
  contacteditor/frmContactEditorXToken.o
-CARDDAVOBJS=carddav/carddav.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
 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 \
@@ -42,18 +85,21 @@ IMEXOBJS=import/import.o import/import-vcard3.o import/import-vcard4.o \
  import/frmImportContacts.o import/frmImportResults.o \
  export/export.o export/export-vcard3.o export/export-vcard4.o
 SEARCHOBJS=search/XABSearchPanel.o search/frmSearchAccounts.o frmSearch.o
-VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o
-FORMOBJS=AppXestiaAddrBk.o frmActivityMgr.o frmAbout.o frmMain.o \
+VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \
+ vcard/vcard34conv-v4conv.o
+ACTMGROBJS=actmgr/frmActivityMgr.o
+FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o \
  frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \
  frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \
  frmUpdate.o
-WIDGETOBJS=widgets/XABAccountView.o
+WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o
 BMCOOBJS=tools/bitmapcode.o
 
 xestiaab: bitmaphelper formobjs widgetobjs commonobjs vcardobjs carddavobjs \
 	ceobjs mainobjs searchobjs imexobjs 
-	$(CPP) $(CPPFLAGS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
-	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT)
+	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) $(COMMONOBJS) \
+	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
+	$(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
@@ -79,7 +125,7 @@ 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
+	widgets/*.o export/*.o import/*.o tests/$(XAB_OUT)_test
 
 distclean: clean
 	rm -f Makefile config.status config.log bitmapsdone \
@@ -90,7 +136,7 @@ distclean: clean
 bitmaphelperobjs: $(BMCOOBJS)
 
 bitmaphelper: bitmaphelperobjs
-	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP)
+	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 
 install:
@@ -99,5 +145,5 @@ install:
 uninstall:
 	rm @BINDIR@/$(XAB_OUT)
 
-docs:
-	@SOFFICEOUT@
+test:
+	@GTEST@