Removed old build files, added install targets and other options

4 files changed, 11 insertions, 63 deletions

diff --git a/addon/doxysearch/CMakeLists.txt b/addon/doxysearch/CMakeLists.txt
index 188d80b..e3511aa 100644
--- a/addon/doxysearch/CMakeLists.txt
+++ b/addon/doxysearch/CMakeLists.txt
@@ -1,24 +1,30 @@
 if (build_search)
 
 find_package(Xapian REQUIRED)
+find_package(ZLIB REQUIRED)
 
 include_directories(
 	${CMAKE_SOURCE_DIR}/qtools
 	${XAPIAN_INCLUDE_DIR}
+        ${ZLIB_INCLUDE_DIRS}
 )
 add_executable(doxyindexer
-doxyindexer.cpp
+               doxyindexer.cpp
 )
 target_link_libraries(doxyindexer
-${XAPIAN_LIBRARIES}
-qtools
+                      ${XAPIAN_LIBRARIES}
+                      ${ZLIB_LIBRARIES}
+                      qtools
 )
 
 add_executable(doxysearch.cgi
-doxysearch.cpp
+               doxysearch.cpp
 )
 target_link_libraries(doxysearch.cgi
-${XAPIAN_LIBRARIES}
+                      ${XAPIAN_LIBRARIES}
+                      ${ZLIB_LIBRARIES}
 )
 
+install(TARGETS doxyindexer doxysearch.cgi DESTINATION bin)
+
 endif()
diff --git a/addon/doxysearch/Makefile.in b/addon/doxysearch/Makefile.in
deleted file mode 100644
index 7daafee..0000000
--- a/addon/doxysearch/Makefile.in
+++ /dev/null
@@ -1,34 +0,0 @@
-
-all clean depend: Makefile.doxysearch Makefile.doxyindexer
-	$(MAKE) -f Makefile.doxysearch $@
-	$(MAKE) -f Makefile.doxyindexer $@
-
-distclean: clean
-	$(RM) -rf Makefile doxysearch.pro Makefile.doxysearch
-	$(RM) -rf Makefile doxyindexer.pro Makefile.doxyindexer
-
-tmake:
-	$(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch
-	$(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer
-
-strip:
-	strip doxysearch
-
-Makefile.doxysearch: doxysearch.pro
-	$(ENV) $(PERL) "$(TMAKE)" doxysearch.pro >Makefile.doxysearch
-
-Makefile.doxyindexer: doxyindexer.pro
-	$(ENV) $(PERL) "$(TMAKE)" doxyindexer.pro >Makefile.doxyindexer
-
-install:
-	$(INSTTOOL) -d $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxysearch.cgi $(INSTALL)/bin	
-	$(INSTTOOL) -m 755 ../../bin/doxyindexer $(INSTALL)/bin	
-	$(INSTTOOL) -d $(INSTALL)/$(MAN1DIR)
-	cat ../../doc/doxyindexer.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxyindexer.1
-	$(INSTTOOL) -m 644 doxyindexer.1 $(INSTALL)/$(MAN1DIR)/doxyindexer.1
-	rm doxyindexer.1
-	cat ../../doc/doxysearch.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxysearch.1
-	$(INSTTOOL) -m 644 doxysearch.1 $(INSTALL)/$(MAN1DIR)/doxysearch.1
-	rm doxysearch.1
-
diff --git a/addon/doxysearch/doxyindexer.pro.in b/addon/doxysearch/doxyindexer.pro.in
deleted file mode 100644
index c84a2ac..0000000
--- a/addon/doxysearch/doxyindexer.pro.in
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE     =	app.t
-CONFIG       =	console warn_on static release
-HEADERS      =	
-SOURCES      =	doxyindexer.cpp
-LIBS        += -L../../lib -lxapian -lqtools
-DESTDIR      = 
-OBJECTS_DIR  = ../../objects/doxyindexer
-TARGET       = ../../bin/doxyindexer
-INCLUDEPATH += ../../qtools
-DEPENDPATH  += 
-TARGETDEPS   = 
-
diff --git a/addon/doxysearch/doxysearch.pro.in b/addon/doxysearch/doxysearch.pro.in
deleted file mode 100644
index 702f5a4..0000000
--- a/addon/doxysearch/doxysearch.pro.in
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE     =	app.t
-CONFIG       =	console warn_on debug cgi
-HEADERS      =	
-SOURCES      =	doxysearch.cpp
-LIBS        += -lxapian
-DESTDIR      = 
-OBJECTS_DIR  = ../../objects/doxysearch
-TARGET       = ../../bin/doxysearch.cgi
-INCLUDEPATH += 
-DEPENDPATH  += 
-TARGETDEPS   = 
-