X-Git-Url: http://Server1/repobrowser/?a=blobdiff_plain;f=source%2FMakefile.in;h=a2b25c7d501a536f5c7cbfb71c8c8e35953ac652;hb=a117b08db467757f5920a4cc5791f89a3b5d830c;hp=17383a6392b620000dc020fca932a37001d40f30;hpb=5ee17950e2c44804fbaf660837f88d725136b978;p=xestiaab%2F.git

diff --git a/source/Makefile.in b/source/Makefile.in
index 17383a6..a2b25c7 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` -lossp-uuid++ -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,7 +85,8 @@ 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
+VCARDOBJS=vcard/vcard.o vcard/vcard34conv.o vcard/vcard34conv-v3conv.o \
+ vcard/vcard34conv-v4conv.o
 FORMOBJS=AppXestiaAddrBk.o frmActivityMgr.o frmAbout.o frmMain.o \
  frmNewAccount.o frmPreferences.o frmContact.o frmConflictResolution.o \
  frmEditAccount.o frmInvalidSSLCertificate.o frmSSLCertificate.o \
@@ -53,7 +97,8 @@ 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)
+	$(VCARDOBJS) $(CEOBJS) $(CARDDAVOBJS) $(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) -o $(XAB_OUT) \
+	$(CPPLIBS)
 ifeq ($(DEBUG), false)
 	$(STRIP) -s $(XAB_OUT)
 endif
@@ -90,5 +135,14 @@ distclean: clean
 bitmaphelperobjs: $(BMCOOBJS)
 
 bitmaphelper: bitmaphelperobjs
-	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP)
+	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
+
+install:
+	cp $(XAB_OUT) @BINDIR@/$(XAB_OUT)
+
+uninstall:
+	rm @BINDIR@/$(XAB_OUT)
+
+docs:
+	@SOFFICEOUT@