[icinga-checkins] icinga.org: icinga-core/mfriedrich/cgis: remove git submodule icinga-api from core git, step 1 #1935

git at icinga.org git at icinga.org
Tue Nov 15 17:50:47 CET 2011


Module: icinga-core
Branch: mfriedrich/cgis
Commit: 150c3e3c66f8d0a69286e43ae32cb8ffff114e34
URL:    https://git.icinga.org/?p=icinga-core.git;a=commit;h=150c3e3c66f8d0a69286e43ae32cb8ffff114e34

Author: Michael Friedrich <michael.friedrich at univie.ac.at>
Date:   Tue Nov 15 16:52:42 2011 +0100

remove git submodule icinga-api from core git, step 1 #1935

refs #1935

---

 .gitmodules       |    3 ---
 Makefile.in       |   16 ++++------------
 module/icinga-api |    1 -
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 264840b..5d39177 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "module/icinga-api"]
-	path = module/icinga-api
-	url = git://git.icinga.org/icinga-api.git
 [submodule "docbook"]
 	path = docbook
 	url = git://git.icinga.org/icinga-doc.git
diff --git a/Makefile.in b/Makefile.in
index 7b31f64..5789497 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -467,18 +467,10 @@ install-idoutils:
 	fi
 
 install-api:
-	@if [ x$(USE_ICINGAAPI) = xyes ]; then \
-		cd $(SRC_ICINGAAPI) && $(MAKE) install; \
-                echo "" ;\
-                echo "*** API installed ***" ;\
-		echo "" ;\
-	else \
-		echo "" ;\
-		echo "Sorry, Icinga API not available!" ;\
-		echo "Check md5 and source in $(SRC_ICINGAAPI)" ;\
-		echo "If using GIT, try # git submodule init ; git submodule update" ;\
-		echo "" ;\
-        fi
+	echo "Sorry, Icinga PHP API was removed from package prior 1.5.0!" ;\
+	echo "Please keep in mind that Icinga-Web uses its own db layer starting with 1.5.0" ;\
+	echo "In case please look for a seperated package and/or icinga-api.git" ;\
+	echo "" ;\
 
 install-init: install-daemoninit
 
diff --git a/module/icinga-api b/module/icinga-api
deleted file mode 160000
index b40a646..0000000
--- a/module/icinga-api
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b40a6468d274d36572b5060c88d79e89f66429a8





More information about the icinga-checkins mailing list