From b8d29e9f58440f1d75bddf77df3d25fd6367af20 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Tue, 20 Feb 2018 12:18:58 +0100
Subject: [PATCH] build: move php7-ext/* to php-ext/

References: KC-1042
---
 Makefile.am                                        | 14 +++++++-------
 .../ECImportContentsChangesProxy.cpp               |  0
 .../ECImportContentsChangesProxy.h                 |  0
 .../ECImportHierarchyChangesProxy.cpp              |  0
 .../ECImportHierarchyChangesProxy.h                |  0
 {php7-ext => php-ext}/main.cpp                     |  0
 {php7-ext => php-ext}/typeconversion.cpp           |  0
 {php7-ext => php-ext}/typeconversion.h             |  0
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename {php7-ext => php-ext}/ECImportContentsChangesProxy.cpp (100%)
 rename {php7-ext => php-ext}/ECImportContentsChangesProxy.h (100%)
 rename {php7-ext => php-ext}/ECImportHierarchyChangesProxy.cpp (100%)
 rename {php7-ext => php-ext}/ECImportHierarchyChangesProxy.h (100%)
 rename {php7-ext => php-ext}/main.cpp (100%)
 rename {php7-ext => php-ext}/typeconversion.cpp (100%)
 rename {php7-ext => php-ext}/typeconversion.h (100%)

diff --git a/Makefile.am b/Makefile.am
index 2f2d4e031..9781a3aa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -776,18 +776,18 @@ dist_phpsysconf_DATA = php-ext/mapi.ini
 # PHP extension
 #
 phplibdir = ${dcprefix}${PHP_EXTENSION_DIR}
-mapi_la_CPPFLAGS = ${AM_CPPFLAGS} ${PHP_INCLUDES} -I${srcdir}/php7-ext -I${srcdir}/php-ext
+mapi_la_CPPFLAGS = ${AM_CPPFLAGS} ${PHP_INCLUDES} -I${srcdir}/php-ext
 mapi_la_CXXFLAGS = ${AM_CXXFLAGS} ${ZPHPCXXFLAGS}
 phplib_LTLIBRARIES = mapi.la
 mapi_la_SOURCES = \
-	php7-ext/ECImportContentsChangesProxy.cpp \
-	php7-ext/ECImportContentsChangesProxy.h \
-	php7-ext/ECImportHierarchyChangesProxy.cpp \
-	php7-ext/ECImportHierarchyChangesProxy.h \
+	php-ext/ECImportContentsChangesProxy.cpp \
+	php-ext/ECImportContentsChangesProxy.h \
+	php-ext/ECImportHierarchyChangesProxy.cpp \
+	php-ext/ECImportHierarchyChangesProxy.h \
 	php-ext/ECRulesTableProxy.cpp php-ext/ECRulesTableProxy.h \
-	php-ext/globals.h php7-ext/main.cpp php-ext/main.h \
+	php-ext/globals.h php-ext/main.cpp php-ext/main.h \
 	php-ext/phpconfig.h \
-	php7-ext/typeconversion.cpp php7-ext/typeconversion.h \
+	php-ext/typeconversion.cpp php-ext/typeconversion.h \
 	php-ext/util.cpp php-ext/util.h
 mapi_la_LIBADD = libmapi.la libkcutil.la libkcfreebusy.la \
 	libkcinetmapi.la libkcicalmapi.la -lpthread
diff --git a/php7-ext/ECImportContentsChangesProxy.cpp b/php-ext/ECImportContentsChangesProxy.cpp
similarity index 100%
rename from php7-ext/ECImportContentsChangesProxy.cpp
rename to php-ext/ECImportContentsChangesProxy.cpp
diff --git a/php7-ext/ECImportContentsChangesProxy.h b/php-ext/ECImportContentsChangesProxy.h
similarity index 100%
rename from php7-ext/ECImportContentsChangesProxy.h
rename to php-ext/ECImportContentsChangesProxy.h
diff --git a/php7-ext/ECImportHierarchyChangesProxy.cpp b/php-ext/ECImportHierarchyChangesProxy.cpp
similarity index 100%
rename from php7-ext/ECImportHierarchyChangesProxy.cpp
rename to php-ext/ECImportHierarchyChangesProxy.cpp
diff --git a/php7-ext/ECImportHierarchyChangesProxy.h b/php-ext/ECImportHierarchyChangesProxy.h
similarity index 100%
rename from php7-ext/ECImportHierarchyChangesProxy.h
rename to php-ext/ECImportHierarchyChangesProxy.h
diff --git a/php7-ext/main.cpp b/php-ext/main.cpp
similarity index 100%
rename from php7-ext/main.cpp
rename to php-ext/main.cpp
diff --git a/php7-ext/typeconversion.cpp b/php-ext/typeconversion.cpp
similarity index 100%
rename from php7-ext/typeconversion.cpp
rename to php-ext/typeconversion.cpp
diff --git a/php7-ext/typeconversion.h b/php-ext/typeconversion.h
similarity index 100%
rename from php7-ext/typeconversion.h
rename to php-ext/typeconversion.h