|
 |
64c3c4 |
diff -up openchange-openchange-2.3-VULCAN/libmapi.pc.in.libmapi-conflict openchange-openchange-2.3-VULCAN/libmapi.pc.in
|
|
|
64c3c4 |
--- openchange-openchange-2.3-VULCAN/libmapi.pc.in.libmapi-conflict 2015-05-16 17:22:04.000000000 +0200
|
|
|
64c3c4 |
+++ openchange-openchange-2.3-VULCAN/libmapi.pc.in 2015-05-18 07:00:01.718355270 +0200
|
|
|
9b1d78 |
@@ -8,7 +8,7 @@ datadir=@datadir@
|
|
|
9b1d78 |
Name: MAPI
|
|
|
9b1d78 |
Description: MAPI Protocol Implementation
|
|
|
9b1d78 |
Version: @PACKAGE_VERSION@
|
|
|
9b1d78 |
-Libs: -L${libdir} -lmapi
|
|
|
9b1d78 |
+Libs: -L${libdir} -lmapi-openchange
|
|
|
9b1d78 |
Libs.private: @LIBS@
|
|
|
9b1d78 |
Cflags: -I${includedir}
|
|
|
9b1d78 |
Requires: talloc dcerpc ndr tevent
|
|
|
64c3c4 |
diff -up openchange-openchange-2.3-VULCAN/Makefile.libmapi-conflict openchange-openchange-2.3-VULCAN/Makefile
|
|
|
64c3c4 |
--- openchange-openchange-2.3-VULCAN/Makefile.libmapi-conflict 2015-05-16 17:22:04.000000000 +0200
|
|
|
64c3c4 |
+++ openchange-openchange-2.3-VULCAN/Makefile 2015-05-18 07:01:57.737350354 +0200
|
|
|
64c3c4 |
@@ -166,7 +166,7 @@ LIBMAPI_SO_VERSION = 0
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi: idl \
|
|
|
9b1d78 |
libmapi/version.h \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi-install: libmapi \
|
|
|
9b1d78 |
libmapi-installpc \
|
|
|
64c3c4 |
@@ -201,8 +201,8 @@ endif
|
|
|
9b1d78 |
rm -f *~
|
|
|
9b1d78 |
rm -f */*~
|
|
|
9b1d78 |
rm -f */*/*~
|
|
|
9b1d78 |
- rm -f libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).* \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT)
|
|
|
9b1d78 |
+ rm -f libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).* \
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
clean:: libmapi-clean
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -219,10 +219,10 @@ libmapi-installpc:
|
|
|
9b1d78 |
libmapi-installlib:
|
|
|
9b1d78 |
@echo "[*] install: libmapi library"
|
|
|
9b1d78 |
$(INSTALL) -d $(DESTDIR)$(libdir)
|
|
|
9b1d78 |
- $(INSTALL) -m 0755 libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
|
|
|
9b1d78 |
- ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT)
|
|
|
9b1d78 |
+ $(INSTALL) -m 0755 libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)
|
|
|
9b1d78 |
+ ln -sf libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi-openchange.$(SHLIBEXT)
|
|
|
9b1d78 |
ifeq ($(MANUALLY_CREATE_SYMLINKS), yes)
|
|
|
9b1d78 |
- ln -sf libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
|
|
|
9b1d78 |
+ ln -sf libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(DESTDIR)$(libdir)/libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
|
|
|
9b1d78 |
endif
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi-installheader:
|
|
|
64c3c4 |
@@ -267,7 +267,7 @@ libmapi-uninstallpc:
|
|
|
9b1d78 |
rm -f $(DESTDIR)$(libdir)/pkgconfig/libmapi.pc
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi-uninstalllib:
|
|
|
9b1d78 |
- rm -f $(DESTDIR)$(libdir)/libmapi.*
|
|
|
9b1d78 |
+ rm -f $(DESTDIR)$(libdir)/libmapi-openchange.*
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi-uninstallheader:
|
|
|
9b1d78 |
rm -rf $(DESTDIR)$(includedir)/libmapi
|
|
|
64c3c4 |
@@ -279,7 +279,7 @@ libmapi-uninstallscript:
|
|
|
9b1d78 |
rm -f $(DESTDIR)$(datadir)/setup/profiles/oc_profiles*
|
|
|
9b1d78 |
rm -rf $(DESTDIR)$(datadir)/setup/profiles
|
|
|
9b1d78 |
|
|
|
9b1d78 |
-libmapi.$(SHLIBEXT).$(PACKAGE_VERSION): \
|
|
|
9b1d78 |
+libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION): \
|
|
|
9b1d78 |
libmapi/emsmdb.po \
|
|
|
9b1d78 |
libmapi/async_emsmdb.po \
|
|
|
9b1d78 |
libmapi/IABContainer.po \
|
|
|
64c3c4 |
@@ -326,10 +326,10 @@ libmapi.$(SHLIBEXT).$(PACKAGE_VERSION):
|
|
|
9b1d78 |
libmapi/socket/interface.po \
|
|
|
9b1d78 |
libmapi/socket/netif.po
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
- @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
+ @$(CC) $(DSOOPT) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
|
|
|
9b1d78 |
-libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION): libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
ln -fs $< $@
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi/version.h: VERSION
|
|
|
64c3c4 |
@@ -364,7 +364,7 @@ libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
libmapi++/src/object.po \
|
|
|
9b1d78 |
libmapi++/src/profile.po \
|
|
|
9b1d78 |
libmapi++/src/session.po \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CXX) $(DSOOPT) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -445,7 +445,7 @@ clean:: libmapixx-tests-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/libmapixx-test: libmapi++/tests/test.cpp \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking sample application $@"
|
|
|
64c3c4 |
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -460,7 +460,7 @@ libmapixx-attach-clean:
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/libmapixx-attach: libmapi++/tests/attach_test.po \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking sample application $@"
|
|
|
64c3c4 |
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -470,7 +470,7 @@ libmapixx-exception: bin/libmapixx-excep
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/libmapixx-exception: libmapi++/tests/exception_test.cpp \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking exception test application $@"
|
|
|
64c3c4 |
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -490,7 +490,7 @@ libmapixx-profiletest-clean:
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/libmapixx-profiletest: libmapi++/tests/profile_test.po \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking profile test application $@"
|
|
|
64c3c4 |
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -511,7 +511,7 @@ libmapixx-messages-clean:
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi++/examples/foldertree: libmapi++/examples/foldertree.cpp \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking foldertree example application $@"
|
|
|
64c3c4 |
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -519,7 +519,7 @@ clean:: libmapixx-foldertree-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
libmapi++/examples/messages: libmapi++/examples/messages.cpp \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking messages example application $@"
|
|
|
64c3c4 |
@$(CXX) $(CXX11FLAGS) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -586,7 +586,7 @@ libmapiadmin-uninstallheader:
|
|
|
9b1d78 |
libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION): \
|
|
|
9b1d78 |
libmapiadmin/mapiadmin_user.po \
|
|
|
9b1d78 |
libmapiadmin/mapiadmin.po \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiadmin.$(SHLIBEXT).$(LIBMAPIADMIN_SO_VERSION) -o $@ $^ $(LIBS) $(LIBMAPIADMIN_LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -663,7 +663,7 @@ libocpf.$(SHLIBEXT).$(PACKAGE_VERSION):
|
|
|
9b1d78 |
libocpf/ocpf_dump.po \
|
|
|
9b1d78 |
libocpf/ocpf_api.po \
|
|
|
9b1d78 |
libocpf/ocpf_write.po \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) $(DSOOPT) $(LDFLAGS) -Wl,-soname,libocpf.$(SHLIBEXT).$(LIBOCPF_SO_VERSION) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -740,7 +740,7 @@ mapiproxy/dcesrv_mapiproxy.$(SHLIBEXT):
|
|
|
9b1d78 |
gen_ndr/ndr_exchange.po
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
- @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
mapiproxy/dcesrv_mapiproxy.c: gen_ndr/ndr_exchange_s.c gen_ndr/ndr_exchange.c
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -748,7 +748,7 @@ mapiproxy/dcesrv_mapiproxy.c: gen_ndr/nd
|
|
|
64c3c4 |
mapiproxy/dcesrv_asyncemsmdb.$(SHLIBEXT): mapiproxy/servers/default/asyncemsmdb/dcesrv_asyncemsmdb.po \
|
|
|
64c3c4 |
gen_ndr/ndr_asyncemsmdb.po
|
|
|
64c3c4 |
@echo "Linking $@"
|
|
|
64c3c4 |
- @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) $(NANOMSG_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
+ @$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(SAMBASERVER_LIBS) $(SAMDB_LIBS) $(NANOMSG_LIBS) -Lmapiproxy mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) mapiproxy/libmapiserver.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
|
|
|
64c3c4 |
|
|
|
64c3c4 |
mapiproxy/servers/default/asyncemsmdb/dcesrv_asyncemsmdb.c: gen_ndr/ndr_asyncemsmdb_s.c gen_ndr/ndr_asyncemsmdb.c
|
|
|
64c3c4 |
@@ -808,7 +808,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
|
|
|
64c3c4 |
mapiproxy/util/mysql.po \
|
|
|
64c3c4 |
mapiproxy/util/schema_migration.po \
|
|
|
64c3c4 |
mapiproxy/util/ccan/htable/htable.po \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -962,7 +962,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
|
|
|
64c3c4 |
mapiproxy/util/ccan/htable/htable.po \
|
|
|
64c3c4 |
mapiproxy/util/ccan/hash/hash.po \
|
|
|
64c3c4 |
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) $(DSOOPT) $(MEMCACHED_CFLAGS) $(CFLAGS) $(LDFLAGS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION) -o $@ $^ $(LIBS) $(TDB_LIBS) $(DL_LIBS) $(MYSQL_LIBS) $(MEMCACHED_LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -984,7 +984,7 @@ mapistore_test: bin/mapistore_test
|
|
|
9b1d78 |
bin/mapistore_test: mapiproxy/libmapistore/tests/mapistore_test.o \
|
|
|
64c3c4 |
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1178,7 +1178,7 @@ clean:: openchangeclient-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/openchangeclient: utils/openchangeclient.o \
|
|
|
9b1d78 |
utils/openchange-tools.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
libocpf.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
|
|
|
64c3c4 |
@@ -1207,7 +1207,7 @@ clean:: mapiprofile-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/mapiprofile: utils/mapiprofile.o \
|
|
|
9b1d78 |
utils/openchange-tools.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1233,7 +1233,7 @@ clean:: ocnotify-clean
|
|
|
64c3c4 |
bin/ocnotify: utils/ocnotify.o \
|
|
|
64c3c4 |
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) $(CFLAGS) $(NANOMSG_CFLAGS) -o $@ $^ $(LDFLAGS) $(NANOMSG_LIBS) $(LIBS) -lpopt
|
|
|
64c3c4 |
|
|
|
64c3c4 |
@@ -1257,7 +1257,7 @@ rpcextract-clean::
|
|
|
64c3c4 |
clean:: rpcextract-clean
|
|
|
64c3c4 |
|
|
|
64c3c4 |
bin/rpcextract: utils/rpcextract.o \
|
|
|
64c3c4 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) $(CFLAGS) $(PCAP_CFLAGS) -o $@ $^ $(LDFLAGS) $(PCAP_LIBS) $(LIBS) -lpopt -lndr
|
|
|
64c3c4 |
|
|
|
64c3c4 |
@@ -1282,7 +1282,7 @@ mapipropsdump-clean::
|
|
|
64c3c4 |
clean:: mapipropsdump-clean
|
|
|
64c3c4 |
|
|
|
64c3c4 |
bin/mapipropsdump: utils/mapipropsdump.o \
|
|
|
64c3c4 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(SAMBA_LIBS) $(LIBS) $(DL_LIBS) -lpopt -lndr
|
|
|
64c3c4 |
|
|
|
64c3c4 |
@@ -1309,7 +1309,7 @@ clean:: openchangepfadmin-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/openchangepfadmin: utils/openchangepfadmin.o \
|
|
|
9b1d78 |
utils/openchange-tools.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
libmapiadmin.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(LIBMAPIADMIN_LIBS) -lpopt
|
|
|
64c3c4 |
@@ -1341,7 +1341,7 @@ clean:: exchange2mbox-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/exchange2mbox: utils/exchange2mbox.o \
|
|
|
9b1d78 |
utils/openchange-tools.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt $(MAGIC_LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1405,7 +1405,7 @@ bin/exchange2ical: utils/exchange2ical_t
|
|
|
9b1d78 |
libexchange2ical/ical2exchange.o \
|
|
|
9b1d78 |
libexchange2ical/ical2exchange_property.o \
|
|
|
9b1d78 |
utils/openchange-tools.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(ICAL_LIBS) -lpopt
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1445,7 +1445,7 @@ bin/openchange-testsuite: testsuite/tes
|
|
|
64c3c4 |
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
64c3c4 |
@echo "Linking $@"
|
|
|
64c3c4 |
- @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) $(PYTHON_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS) -lpopt libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) $(MEMCACHED_LIBS)
|
|
|
64c3c4 |
+ @$(CC) $(CFLAGS) $(CHECK_CFLAGS) $(TDB_CFLAGS) $(PYTHON_CFLAGS) -I. -Itestsuite/ -Imapiproxy -o $@ $^ $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(CHECK_LIBS) $(MYSQL_LIBS) $(PYTHON_LIBS) -lpopt libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) $(MEMCACHED_LIBS)
|
|
|
64c3c4 |
|
|
|
64c3c4 |
testsuite-check: testsuite
|
|
|
64c3c4 |
@LD_LIBRARY_PATH=. PYTHONPATH=./python CK_XML_LOG_FILE_NAME=test_results.xml ./bin/openchange-testsuite
|
|
|
64c3c4 |
@@ -1513,7 +1513,7 @@ bin/mapitest: utils/mapitest/mapitest.o
|
|
|
9b1d78 |
utils/mapitest/modules/module_lcid.o \
|
|
|
9b1d78 |
utils/mapitest/modules/module_mapidump.o \
|
|
|
9b1d78 |
utils/mapitest/modules/module_lzxpress.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt $(SUBUNIT_LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1574,7 +1574,7 @@ clean:: openchangemapidump-clean
|
|
|
9b1d78 |
bin/openchangemapidump: utils/backup/openchangemapidump.o \
|
|
|
9b1d78 |
utils/backup/openchangebackup.o \
|
|
|
9b1d78 |
utils/openchange-tools.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1625,7 +1625,7 @@ check_fasttransfer-clean::
|
|
|
9b1d78 |
clean:: check_fasttransfer-clean
|
|
|
9b1d78 |
|
|
|
64c3c4 |
bin/check_fasttransfer: testprogs/check_fasttransfer.o \
|
|
|
64c3c4 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
64c3c4 |
mapiproxy/libmapiproxy.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
64c3c4 |
@@ -1653,7 +1653,7 @@ test_asyncnotif-clean::
|
|
|
9b1d78 |
clean:: test_asyncnotif-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/test_asyncnotif: testprogs/test_asyncnotif.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1701,13 +1701,13 @@ pyopenchange: $(pythonscriptdir)/opench
|
|
|
9b1d78 |
|
|
|
9b1d78 |
$(pythonscriptdir)/openchange/mapi.$(SHLIBEXT): pyopenchange/pymapi.c \
|
|
|
9b1d78 |
pyopenchange/pymapi_properties.c \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
64c3c4 |
@$(CC) $(PYTHON_CFLAGS) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
# $(pythonscriptdir)/openchange/ocpf.$(SHLIBEXT): pyopenchange/pyocpf.c \
|
|
|
9b1d78 |
# libocpf.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
-# libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+# libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
# @echo "Linking $@"
|
|
|
64c3c4 |
# @$(CC) $(PYTHON_CFLAGS) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_LIBS) $(LIBS)
|
|
|
9b1d78 |
|
|
|
64c3c4 |
@@ -1894,7 +1894,7 @@ libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
qt/demo/demoapp: qt/demo/demoapp.o \
|
|
|
9b1d78 |
qt/demo/main.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
libmapipp.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
libqtmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|