X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=blobdiff_plain;f=source%2FMakefile.in;h=18dbc3738795c474913f0fb2a449a962bacd57fa;hp=38c0de3a887f33ceada7509cdea127fe96c7178c;hb=ee9b71949005734012f18251774807c38b989ae2;hpb=16c32f9a916d348dedb2f02c481633a04838a808

diff --git a/source/Makefile.in b/source/Makefile.in
index 38c0de3..18dbc37 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -10,6 +10,8 @@ XAB_OUT=xestiaab
 BMCO_HELP=tools/bitmapcode.helper
 BMCO_DIR=../bitmaps
 
+ODTHELPBROWSER=tools/odthelpbrowser/odthelpbrowser
+
 MAINOBJS=main.o convert.o
 CEOBJS=contacteditor/frmContactEditor.o \
  contacteditor/frmContactEditor-Business.o \
@@ -54,14 +56,10 @@ CDOOBJS=contacteditor/cdo/ContactDataObject.o \
  contacteditor/cdo/ContactDataObject-Save.o
 CONNOBJS=connobject/ConnectionObject.o
 CARDDAV2OBJS=carddav2/carddav2.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 \
- common/dirs.o common/mime.o
+ common/dirs.o common/mime.o common/languages.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
@@ -75,18 +73,24 @@ FORMOBJS=AppXestiaAddrBk.o frmAbout.o frmMain.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
+WIDGETOBJS=widgets/XABAccountView.o widgets/XABContactMenu.o \
+ widgets/XABPriorityCtrl.o
 BMCOOBJS=tools/bitmapcode.o
+ODTHELPBROWSEROBJS=tools/odthelpbrowser/main.o \
+ tools/odthelpbrowser/ODTHelpBrowser.o \
+ tools/odthelpbrowser/frmMain.o \
+ tools/odthelpbrowser/odt.o \
+ tools/odthelpbrowser/base64.o
 
 default:
 	$(MAKE) bitmaphelper
 	$(MAKE) xestiaab
 
 xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
-	connobjs carddavobjs carddav2objs ceobjs cdoobjs mainobjs \
+	connobjs carddav2objs ceobjs cdoobjs mainobjs \
 	searchobjs imexobjs 
 	$(CPP) $(CPPFLAGS) $(ACTMGROBJS) $(FORMOBJS) $(WIDGETOBJS) \
-	$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) $(CARDDAVOBJS) \
+	$(COMMONOBJS) $(VCARDOBJS) $(CEOBJS) $(CDOOBJS) \
 	$(SEARCHOBJS) $(MAINOBJS) $(IMEXOBJS) $(CONNOBJS) $(CARDDAV2OBJS) \
 	-o $(XAB_OUT) $(CPPLIBS)
 ifeq ($(DEBUG), false)
@@ -95,8 +99,6 @@ endif
 
 actmgrobjs: $(ACTMGROBJS)
 
-carddavobjs: $(CARDDAVOBJS)
-
 carddav2objs: $(CARDDAV2OBJS)
 
 connobjs: $(CONNOBJS)
@@ -120,10 +122,12 @@ 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 actmgr/*.o contacteditor/cdo/*.o \
-	tests/Temp* tests/*.o tests/$(XAB_OUT)_test
+	rm -f $(XAB_OUT) $(BMCO_HELP) $(ODTHELPBROWSER) \
+	tools/bitmapcode.o *.o 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 tools/odthelpbrowser/*.o \
+	tools/odthelpbrowser/odthelpbrowser tests/$(XAB_OUT)_test
 
 distclean: clean
 	rm -f Makefile tests/Makefile \
@@ -139,11 +143,18 @@ bitmaphelper: bitmaphelperobjs
 	$(CPP) $(CPPFLAGS) $(BMCOOBJS) -o $(BMCO_HELP) $(CPPLIBS)
 	$(BMCO_HELP) bitmaps/
 
+odthelpbrowserobjs: $(ODTHELPBROWSEROBJS)
+
+odthelpbrowser: odthelpbrowserobjs
+	$(CPP) $(CPPFLAGS) $(ODTHELPBROWSEROBJS) -o $(ODTHELPBROWSER) $(CPPLIBS)
+
 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:
 	@echo "To build and run the unit tests, run 'make' from the tests directory."