build: move php7-ext/* to php-ext/

References: KC-1042
Kopano-dev · Aug 15, 2019 · b8d29e9 · b8d29e9
1 parent 153067d
commit b8d29e9
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git 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 → php-ext/ECImportContentsChangesProxy.cpp b/php7-ext/ECImportContentsChangesProxy.cpp → php-ext/ECImportContentsChangesProxy.cpp
diff --git a/php7-ext/ECImportContentsChangesProxy.h → php-ext/ECImportContentsChangesProxy.h b/php7-ext/ECImportContentsChangesProxy.h → php-ext/ECImportContentsChangesProxy.h
diff --git a/php7-ext/ECImportHierarchyChangesProxy.cpp → php-ext/ECImportHierarchyChangesProxy.cpp b/php7-ext/ECImportHierarchyChangesProxy.cpp → php-ext/ECImportHierarchyChangesProxy.cpp
diff --git a/php7-ext/ECImportHierarchyChangesProxy.h → php-ext/ECImportHierarchyChangesProxy.h b/php7-ext/ECImportHierarchyChangesProxy.h → php-ext/ECImportHierarchyChangesProxy.h
diff --git a/php7-ext/main.cpp → php-ext/main.cpp b/php7-ext/main.cpp → php-ext/main.cpp
diff --git a/php7-ext/typeconversion.cpp → php-ext/typeconversion.cpp b/php7-ext/typeconversion.cpp → php-ext/typeconversion.cpp
diff --git a/php7-ext/typeconversion.h → php-ext/typeconversion.h b/php7-ext/typeconversion.h → php-ext/typeconversion.h