merged in default gnupg-2.1
authorKrista Bennett <krista@pep-project.org>
Thu, 13 Jul 2017 13:28:43 +0200
branchgnupg-2.1
changeset 19220d9f147a763f
parent 1921 2bbb3d83c7c1
parent 1919 335cdc692960
child 1923 e487588a77dc
merged in default
     1.1 --- a/Makefile	Thu Jul 13 13:27:44 2017 +0200
     1.2 +++ b/Makefile	Thu Jul 13 13:28:43 2017 +0200
     1.3 @@ -17,6 +17,7 @@
     1.4  
     1.5  install: all
     1.6  	$(MAKE) -C src install
     1.7 +	$(MAKE) -C asn.1 install
     1.8  
     1.9  uninstall:
    1.10  	$(MAKE) -C src uninstall
     2.1 --- a/asn.1/Makefile	Thu Jul 13 13:27:44 2017 +0200
     2.2 +++ b/asn.1/Makefile	Thu Jul 13 13:28:43 2017 +0200
     2.3 @@ -32,3 +32,6 @@
     2.4  
     2.5  clean:
     2.6  	rm -f *.a *.o *.c *.h *.sample
     2.7 +
     2.8 +install: libasn1.a
     2.9 +	cp $< $(PREFIX)/lib/
     3.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Thu Jul 13 13:27:44 2017 +0200
     3.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Thu Jul 13 13:28:43 2017 +0200
     3.3 @@ -13,6 +13,7 @@
     3.4  		43BA0F461D7964750059172F /* asn1_helper.c in Sources */ = {isa = PBXBuildFile; fileRef = 43BA0F451D7964750059172F /* asn1_helper.c */; };
     3.5  		43E9BC6A1DB51A1E00AD2352 /* GroupUpdate.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */; };
     3.6  		43E9BC7F1DB6720E00AD2352 /* UpdateRequest.c in Sources */ = {isa = PBXBuildFile; fileRef = 43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */; };
     3.7 +		43F6921D1F164A47009418F5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
     3.8  		6400FB861B8CA1C6005221E3 /* libnetpgp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 645922521B8BD32B00A5AF93 /* libnetpgp.a */; };
     3.9  		6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 64289E371B8B630200FC617B /* libetpan-ios.a */; };
    3.10  		644297C51BE11CE0002BC73B /* system.db in Resources */ = {isa = PBXBuildFile; fileRef = 64951A1B1BE0FCD800B10E71 /* system.db */; };
    3.11 @@ -196,6 +197,7 @@
    3.12  		43BA0F451D7964750059172F /* asn1_helper.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = asn1_helper.c; path = ../src/asn1_helper.c; sourceTree = "<group>"; };
    3.13  		43E9BC691DB51A1E00AD2352 /* GroupUpdate.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = GroupUpdate.c; path = ../asn.1/GroupUpdate.c; sourceTree = "<group>"; };
    3.14  		43E9BC7E1DB6720E00AD2352 /* UpdateRequest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = UpdateRequest.c; path = ../asn.1/UpdateRequest.c; sourceTree = "<group>"; };
    3.15 +		43F6921C1F164A47009418F5 /* resource_id.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource_id.c; path = ../src/resource_id.c; sourceTree = "<group>"; };
    3.16  		644297BF1BE11C65002BC73B /* pEpTrustWords.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpTrustWords.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
    3.17  		644297C11BE11C65002BC73B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
    3.18  		646788871CEB3D120001F54C /* map_asn1.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = map_asn1.c; path = ../src/map_asn1.c; sourceTree = "<group>"; };
    3.19 @@ -507,6 +509,7 @@
    3.20  		64A8264B1B455C5600EECAF0 /* srcref */ = {
    3.21  			isa = PBXGroup;
    3.22  			children = (
    3.23 +				43F6921C1F164A47009418F5 /* resource_id.c */,
    3.24  				43BA0F451D7964750059172F /* asn1_helper.c */,
    3.25  				4354FF641D6EDF300033069C /* sync_impl.c */,
    3.26  				646C414C1D510D8800C63EFF /* baseprotocol.c */,
    3.27 @@ -854,6 +857,7 @@
    3.28  				646C41041D510CD800C63EFF /* constr_SEQUENCE.c in Sources */,
    3.29  				64A826881B455D0800EECAF0 /* timestamp.c in Sources */,
    3.30  				646C41221D510CD800C63EFF /* NativeEnumerated.c in Sources */,
    3.31 +				43F6921D1F164A47009418F5 /* resource_id.c in Sources */,
    3.32  				430D258B1C9ED75A00B94535 /* blacklist.c in Sources */,
    3.33  				646C414E1D510D8800C63EFF /* baseprotocol.c in Sources */,
    3.34  				6467888C1CEB3D120001F54C /* map_asn1.c in Sources */,