diff --git a/OpenChange/GNUmakefile b/OpenChange/GNUmakefile index df3f5f116..3d9fa5b9f 100644 --- a/OpenChange/GNUmakefile +++ b/OpenChange/GNUmakefile @@ -7,8 +7,6 @@ include ../Version BACKEND_VERSION = 1.0.0 -UNRTF_VERSION = 0.21.2 - ### bootstrap library MAPISTORESOGO = MAPIStoreSOGo LIBRARY_NAME = $(MAPISTORESOGO) @@ -136,9 +134,7 @@ $(SOGOBACKEND)_OBJC_FILES += \ $(SOGOBACKEND)_RESOURCE_FILES += \ - product.plist \ - $(UNRTF_DIR)/charmaps/SYMBOL.charmap \ - $(UNRTF_DIR)/outputs/html.conf + product.plist ### pl reader PLREADER_TOOL = plreader @@ -190,7 +186,6 @@ ADDITIONAL_INCLUDE_DIRS += \ -DSAMBA_PRIVATE_DIR=@"\"$(SAMBA_PRIVATE_DIR)\"" \ $(LIBMAPI_CFLAGS) \ $(LIBMAPISTORE_CFLAGS) \ - -I$(UNRTF_DIR)/src \ -I../SoObjects -I../SOPE \ -DBACKEND_BUNDLE_NAME="@\"$(BUNDLE_NAME)$(BUNDLE_EXTENSION)\"" \ -DSOGO_BUNDLES_DIR="@\"$(BUNDLE_INSTALL_DIR)\"" diff --git a/OpenChange/GNUmakefile.unrtf b/OpenChange/GNUmakefile.unrtf deleted file mode 100644 index eaac4764a..000000000 --- a/OpenChange/GNUmakefile.unrtf +++ /dev/null @@ -1,34 +0,0 @@ -# -*-makefile-*- - -# GNUstep makefile - -include $(GNUSTEP_MAKEFILES)/common.make - -UNRTF = unrtf - -SUBPROJECT_NAME = $(UNRTF) - -$(UNRTF)_C_FILES = \ - attr.c \ - convert.c \ - error.c \ - hash.c \ - malloc.c \ - my_iconv.c \ - output.c \ - parse.c \ - unicode.c \ - user.c \ - util.c \ - word.c - -$(UNRTF)_CFLAGS = -DHAVE_CONFIG_H=1 -I. -I../ - -# Option include to set any additional variables --include GNUmakefile.preamble - -# Include in the rules for making libraries -include $(GNUSTEP_MAKEFILES)/subproject.make - -# Option include to define any additional rules --include GNUmakefile.postamble diff --git a/packaging/debian-multiarch/rules b/packaging/debian-multiarch/rules index e19250d41..688c6d399 100755 --- a/packaging/debian-multiarch/rules +++ b/packaging/debian-multiarch/rules @@ -41,8 +41,6 @@ clean: make clean; \ fi -rm -f OpenChange/MAPIStorePropertySelectors.* - -find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \; - -rm -f OpenChange/unrtf*-stamp -rm -f config.make dh_clean diff --git a/packaging/debian/rules b/packaging/debian/rules index 60ee25136..dc38073a1 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -45,8 +45,6 @@ clean: make clean; \ fi -rm -f OpenChange/MAPIStorePropertySelectors.* - -find OpenChange -type d -name "unrtf-*" -exec rm -rf {} \; - -rm -f OpenChange/unrtf*-stamp -rm -f config.make dh_clean