Build system (Linux) updates

[xestiaab/.git] / source / Makefile.in

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