|
 |
9b1d78 |
diff -up openchange-2.0-QUADRANT/libmapi.pc.in.libmapi-conflict openchange-2.0-QUADRANT/libmapi.pc.in
|
|
|
9b1d78 |
--- openchange-2.0-QUADRANT/libmapi.pc.in.libmapi-conflict 2013-01-24 19:55:36.000000000 +0100
|
|
|
9b1d78 |
+++ openchange-2.0-QUADRANT/libmapi.pc.in 2013-01-31 18:41:08.405877184 +0100
|
|
|
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
|
|
|
9b1d78 |
diff -up openchange-2.0-QUADRANT/Makefile.libmapi-conflict openchange-2.0-QUADRANT/Makefile
|
|
|
9b1d78 |
--- openchange-2.0-QUADRANT/Makefile.libmapi-conflict 2013-01-24 19:55:36.000000000 +0100
|
|
|
9b1d78 |
+++ openchange-2.0-QUADRANT/Makefile 2013-01-31 18:42:59.285237972 +0100
|
|
|
9b1d78 |
@@ -159,7 +159,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 \
|
|
|
9b1d78 |
@@ -192,8 +192,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 |
|
|
|
9b1d78 |
@@ -210,10 +210,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:
|
|
|
9b1d78 |
@@ -254,7 +254,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
|
|
|
9b1d78 |
@@ -265,7 +265,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 \
|
|
|
9b1d78 |
@@ -309,10 +309,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
|
|
|
9b1d78 |
@@ -347,7 +347,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(DSOOPT) $(CXXFLAGS) $(LDFLAGS) -Wl,-soname,libmapipp.$(SHLIBEXT).$(LIBMAPIPP_SO_VERSION) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -428,7 +428,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -443,7 +443,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -453,7 +453,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -473,7 +473,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -494,7 +494,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -502,7 +502,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 $@"
|
|
|
9b1d78 |
@$(CXX) $(CXXFLAGS) -o $@ $^ $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -569,7 +569,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 |
|
|
|
9b1d78 |
@@ -646,7 +646,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 |
|
|
|
9b1d78 |
@@ -720,7 +720,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 |
|
|
|
9b1d78 |
@@ -767,7 +767,7 @@ mapiproxy/libmapiproxy.$(SHLIBEXT).$(PAC
|
|
|
9b1d78 |
mapiproxy/libmapiproxy/mapi_handles.po \
|
|
|
9b1d78 |
mapiproxy/libmapiproxy/entryid.po \
|
|
|
9b1d78 |
mapiproxy/libmapiproxy/modules.po \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $(DSOOPT) $(LDFLAGS) -Wl,-soname,libmapiproxy.$(SHLIBEXT).$(LIBMAPIPROXY_SO_VERSION) $^ -L. $(LIBS) $(TDB_LIBS) $(DL_LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -912,7 +912,7 @@ mapiproxy/libmapistore.$(SHLIBEXT).$(PAC
|
|
|
9b1d78 |
mapiproxy/libmapistore/mapistore_replica_mapping.po \
|
|
|
9b1d78 |
mapiproxy/libmapistore/mapistore_namedprops.po \
|
|
|
9b1d78 |
mapiproxy/libmapistore/mapistore_notification.po \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $(DSOOPT) $^ -L. $(LDFLAGS) $(LIBS) $(TDB_LIBS) $(DL_LIBS) -Wl,-soname,libmapistore.$(SHLIBEXT).$(LIBMAPISTORE_SO_VERSION)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -934,7 +934,7 @@ mapistore_test: bin/mapistore_test
|
|
|
9b1d78 |
bin/mapistore_test: mapiproxy/libmapistore/tests/mapistore_test.o \
|
|
|
9b1d78 |
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
- @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
+ @$(CC) -o $@ $^ $(LDFLAGS) $(LIBS) -lpopt -L. libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
mapistore_clean:
|
|
|
9b1d78 |
rm -f mapiproxy/libmapistore/tests/*.o
|
|
|
9b1d78 |
@@ -1103,7 +1103,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
|
|
|
9b1d78 |
@@ -1132,7 +1132,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 |
|
|
|
9b1d78 |
@@ -1160,7 +1160,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
|
|
|
9b1d78 |
@@ -1192,7 +1192,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 |
|
|
|
9b1d78 |
@@ -1256,7 +1256,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 |
|
|
|
9b1d78 |
@@ -1320,7 +1320,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 |
|
|
|
9b1d78 |
@@ -1378,7 +1378,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 |
|
|
|
9b1d78 |
@@ -1429,7 +1429,7 @@ check_fasttransfer-clean::
|
|
|
9b1d78 |
clean:: check_fasttransfer-clean
|
|
|
9b1d78 |
|
|
|
9b1d78 |
bin/check_fasttransfer: testprogs/check_fasttransfer.o \
|
|
|
9b1d78 |
- libmapi.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
+ libmapi-openchange.$(SHLIBEXT).$(PACKAGE_VERSION) \
|
|
|
9b1d78 |
mapiproxy/libmapistore.$(SHLIBEXT).$(PACKAGE_VERSION)
|
|
|
9b1d78 |
@echo "Linking $@"
|
|
|
9b1d78 |
@$(CC) -o $@ $^ $(LIBS) $(LDFLAGS) -lpopt
|
|
|
9b1d78 |
@@ -1456,7 +1456,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 |
|
|
|
9b1d78 |
@@ -1501,13 +1501,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 $@"
|
|
|
9b1d78 |
@$(CC) $(CFLAGS) -fno-strict-aliasing $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(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 $@"
|
|
|
9b1d78 |
# @$(CC) $(CFLAGS) $(DSOOPT) $(LDFLAGS) -o $@ $^ $(PYTHON_CFLAGS) $(PYTHON_LIBS) $(LIBS)
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -1625,7 +1625,7 @@ ctags:
|
|
|
9b1d78 |
|
|
|
9b1d78 |
test:: check
|
|
|
9b1d78 |
|
|
|
9b1d78 |
-check:: libmapi.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
|
|
|
9b1d78 |
+check:: libmapi-openchange.$(SHLIBEXT).$(LIBMAPI_SO_VERSION)
|
|
|
9b1d78 |
# FIXME: Set up server
|
|
|
9b1d78 |
./bin/mapitest --mapi-calls
|
|
|
9b1d78 |
|
|
|
9b1d78 |
@@ -1698,7 +1698,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 $@"
|