From: Steve Brokenshire <sbrokenshire@xestia.co.uk>
Date: Sun, 26 Aug 2018 12:14:01 +0000 (+0100)
Subject: Makefile.in: Compile/Install/Uninstall ODT Help Browser
X-Git-Tag: release-0.23~11
X-Git-Url: http://Server1/repobrowser/?p=xestiaab%2F.git;a=commitdiff_plain;h=da6582de9be21bb200835190dc7484ab83dd3f1b;hp=be26d99a1646239d1e4154d6939b953c1ce82cb0

Makefile.in: Compile/Install/Uninstall ODT Help Browser
---

diff --git a/source/Makefile.in b/source/Makefile.in
index e5c6960..85a7438 100644
--- a/source/Makefile.in
+++ b/source/Makefile.in
@@ -11,7 +11,8 @@ XAB_OUT=xestiaab
 BMCO_HELP=tools/bitmapcode.helper
 BMCO_DIR=../bitmaps
 
-ODTHELPBROWSER=tools/odthelpbrowser/odthelpbrowser
+ODTHELPBROWSER_OUT=odthelpbrowser
+ODTHELPBROWSER_PATH=tools/odthelpbrowser/$(ODTHELPBROWSER_OUT)
 
 MAINOBJS=main.o convert.o
 CEOBJS=contacteditor/frmContactEditor.o \
@@ -85,6 +86,7 @@ ODTHELPBROWSEROBJS=tools/odthelpbrowser/main.o \
 
 default:
 	$(MAKE) bitmaphelper
+	$(MAKE) odthelpbrowser
 	$(MAKE) xestiaab
 
 xestiaab: actmgrobjs formobjs widgetobjs commonobjs vcardobjs \
@@ -123,7 +125,7 @@ widgetobjs: $(WIDGETOBJS)
 imexobjs: $(IMEXOBJS)
 
 clean:
-	rm -f $(XAB_OUT) $(BMCO_HELP) $(ODTHELPBROWSER) \
+	rm -f $(XAB_OUT) $(BMCO_HELP) $(ODTHELPBROWSER_PATH) \
 	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 \
@@ -147,7 +149,7 @@ bitmaphelper: bitmaphelperobjs
 odthelpbrowserobjs: $(ODTHELPBROWSEROBJS)
 
 odthelpbrowser: odthelpbrowserobjs
-	$(CPP) $(CPPFLAGS) $(ODTHELPBROWSEROBJS) -o $(ODTHELPBROWSER) $(CPPLIBS)
+	$(CPP) $(CPPFLAGS) $(ODTHELPBROWSEROBJS) -o $(ODTHELPBROWSER_PATH) $(CPPLIBS)
 
 install-docs:
 	#TODO: Add @PREFIX@ for docs, xestiaab and man page
@@ -156,6 +158,7 @@ install-docs:
 
 install: install-docs
 	cp $(XAB_OUT) @BINDIR@/$(XAB_OUT)
+	cp $(ODTHELPBROWSER_PATH) @BINDIR@/$(ODTHELPBROWSER_OUT)
 	cp xestiaab.1 @DATAROOTDIR@/man/man1/xestiaab.1
 
 uninstall-docs:
@@ -163,6 +166,7 @@ uninstall-docs:
 
 uninstall: uninstall-docs
 	rm @BINDIR@/$(XAB_OUT)
+	cp @BINDIR@/$(ODTHELPBROWSER_OUT)
 	rm @DATAROOTDIR@/man/man1/xestiaab.1
 
 test: