X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=ab9c9e2c7fc8ed4a2aa075e93ed76f5f006fbe32;hb=dae89fcb9baf7117917f808904005fd05e41a253;hp=a966a15ddad725b66ac8c3f529a5847737360a24;hpb=d656452e7bdcf0b32c93c18d4e61c8567cc01958;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index a966a15..ab9c9e2 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -1,44 +1,91 @@
-CPP=g++
-CPPFLAGS=`wx-config --cxxflags --libs` -lboost_filesystem -lboost_system -Os
-
-XAB_OUT=xestiaab
-
-MAINOBJS=main.o
-CEOBJS=contacteditor/frmContactEditor.o \
- contacteditor/frmContactEditorAddress.o \
- contacteditor/frmContactEditorEmail.o \
- contacteditor/frmContactEditorIM.o \
- contacteditor/frmContactEditorTelephone.o \
- contacteditor/frmContactEditorLanguages.o \
- contacteditor/frmContactEditorTimezones.o \
- contacteditor/frmContactEditorRelated.o \
- contacteditor/frmContactEditorWebsites.o \
- contacteditor/frmContactEditorTitles.o \
- contacteditor/frmContactEditorRoles.o \
- contacteditor/frmContactEditorOrganisations.o \
- contacteditor/frmContactEditorNotes.o  
-COMMONOBJS=common/base64.o common/preferences.o common/getcontactinfo.o \
- common/textprocessing.o
-VCARDOBJS=vcard/vcard.o
-FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.o frmNewAccount.o \
-frmPreferences.o frmContact.o
-
-xestiaab: mainobjs commonobjs vcardobjs ceobjs formobjs
-	$(CPP) $(CPPFLAGS) $(MAINOBJS) $(COMMONOBJS) $(VCARDOBJS) \
-	$(FORMOBJS) $(CEOBJS) -o $(XAB_OUT)
-
-mainobjs: $(MAINOBJS)
-
-commonobjs: $(COMMONOBJS)
-
-vcardobjs: $(VCARDOBJS)
-
-ceobjs: $(CEOBJS)	
-
-formobjs: $(FORMOBJS)
-
-clean:
-	rm -f xestiaab *.o vcard/*.o common/*.o contacteditor/*.o
-
-distclean: clean
-	rm -f Makefile config.status config.log
+CPP=g++
+STRIP=strip
+CPPFLAGS=`xml2-config --cflags` `wx-config --cxxflags --libs` `curl-config --libs` -lossp-uuid++ -lmagic -lsfml-audio -lxml2 -std=c++11 @DBGOUT@ -ggdb
+
+@DBGSTATUS@
+XAB_OUT=xestiaab
+
+BMCO_HELP=tools/bitmapcode.helper
+BMCO_DIR=../bitmaps
+
+MAINOBJS=main.o
+CEOBJS=contacteditor/frmContactEditor.o \
+ contacteditor/frmContactEditor-Load.o \
+ contacteditor/frmContactEditorNickname.o \
+ contacteditor/frmContactEditorAddress.o \
+ contacteditor/frmContactEditorEmail.o \
+ contacteditor/frmContactEditorIM.o \
+ contacteditor/frmContactEditorTelephone.o \
+ contacteditor/frmContactEditorLanguages.o \
+ contacteditor/frmContactEditorTimezones.o \
+ contacteditor/frmContactEditorRelated.o \
+ contacteditor/frmContactEditorWebsites.o \
+ contacteditor/frmContactEditorGeoposition.o \
+ contacteditor/frmContactEditorTitles.o \
+ contacteditor/frmContactEditorRoles.o \
+ contacteditor/frmContactEditorOrganisations.o \
+ contacteditor/frmContactEditorNotes.o \
+ contacteditor/frmContactEditorGroups.o \
+ contacteditor/frmContactEditorPicture.o \
+ contacteditor/frmContactEditorSound.o \
+ contacteditor/frmContactEditorCategory.o \
+ contacteditor/frmContactEditorCalAdr.o \
+ contacteditor/frmContactEditorKey.o \
+ contacteditor/frmContactEditorVendor.o \
+ contacteditor/frmContactEditorXToken.o
+CARDDAVOBJS=carddav/carddav.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 \
+ common/dirs.o common/mime.o
+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 \
+ frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \
+ frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \
+ frmUpdate.o
+WIDGETOBJS=widgets/XABAccountView.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)
+ifeq ($(DEBUG), false)
+	$(STRIP) -s $(XAB_OUT)
+endif
+
+carddavobjs: $(CARDDAVOBJS)
+
+mainobjs: $(MAINOBJS)
+
+commonobjs: $(COMMONOBJS)
+
+vcardobjs: $(VCARDOBJS)
+
+ceobjs: $(CEOBJS)	
+
+formobjs: $(FORMOBJS)
+
+searchobjs: $(SEARCHOBJS)
+
+widgetobjs: $(WIDGETOBJS)
+
+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
+
+distclean: clean
+	rm -f Makefile config.status config.log
+
+bitmaphelperobjs: $(BMCOOBJS)
+
+bitmaphelper: bitmaphelperobjs
+	$(CPP) $(CPPFLAGS) -lboost_filesystem -lboost_system $(BMCOOBJS) -o $(BMCO_HELP)
+	$(BMCO_HELP) bitmaps/