Merge pull request #2799 from BrzVlad/fix-conc-card-clean

[mono.git] / mcs / tools / security / Makefile

diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile
index 898a17b7d909a51a9c1f1d67c342cedd3f038f0b..d75599dcee58228921d6ceb6e2e66d4f2a90114c 100644 (file)
--- a/mcs/tools/security/Makefile
+++ b/mcs/tools/security/Makefile
@@ -3,42 +3,53 @@ SUBDIRS =
 DIST_ONLY_SUBDIRS = certview
 include ../../build/rules.make
 
-LOCAL_MCS_FLAGS = /lib:$(topdir)/class/lib/$(PROFILE) -r:Mono.Security.dll
+LOCAL_MCS_FLAGS = /lib:$(topdir)/class/lib/$(PROFILE) -r:Mono.Security.dll -r:System.dll
 
-SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe makecert.exe chktrust.exe \
-       signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe mozroots.exe
-SECURITY_SOURCES = AssemblyInfo.cs $(topdir)/build/common/Consts.cs StrongNameManager.cs $(SECURITY_PROGRAMS:.exe=.cs)
+SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe makecert.exe chktrust.exe crlupdate.exe \
+       signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe mozroots.exe cert-sync.exe
+SECURITY_PROGRAMS_2_0 = httpcfg.exe
+
+HELPER_SOURCES = AssemblyInfo.cs $(topdir)/build/common/Consts.cs
+SN_SOURCES = sn.cs StrongNameManager.cs $(HELPER_SOURCES)
+
+SECURITY_SOURCES = $(HELPER_SOURCES) $(SN_SOURCES) $(SECURITY_PROGRAMS:.exe=.cs) $(SECURITY_PROGRAMS_2_0:.exe=.cs)
+
+ifeq ($(DEFAULT_PROFILE), $(PROFILE))
+SECURITY_TARGETS = $(SECURITY_PROGRAMS) $(SECURITY_PROGRAMS_2_0)
+endif
 
 PROGRAM_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)
 
 DISTFILES = README TESTS $(SECURITY_SOURCES)
 
-ifeq (net_1_1_bootstrap, $(PROFILE))
+ifeq (build, $(PROFILE))
 all-local: $(topdir)/class/lib/$(PROFILE)/sn.exe
 else
-all-local: $(SECURITY_PROGRAMS)
+all-local: $(SECURITY_TARGETS)
 endif
 
+doc-update-local:
+
 install-local: all-local
 uninstall-local:
 
 ifndef NO_INSTALL
-install-local: $(SECURITY_PROGRAMS)
+install-local: $(SECURITY_TARGETS)
        $(MKINSTALLDIRS) $(DESTDIR)$(PROGRAM_INSTALL_DIR)
-       for p in $(SECURITY_PROGRAMS) ; do \
+       for p in $(SECURITY_TARGETS) ; do \
            $(INSTALL_BIN) $$p $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
            test ! -f $$p.mdb || $(INSTALL_BIN) $$p.mdb $(DESTDIR)$(PROGRAM_INSTALL_DIR) ; \
        done
 
 uninstall-local:
-       for p in $(SECURITY_PROGRAMS) ; do \
+       for p in $(SECURITY_TARGETS) ; do \
            rm -f $(DESTDIR)$(PROGRAM_INSTALL_DIR)/$$p* ; \
        done
 endif
 
 test-local:
 
-run-test-local run-test-ondotnet-local:
+run-test-local run-test-ondotnet-local csproj-local:
 
 clean-local:
        rm -f *.exe *.mdb *.pdb
@@ -46,9 +57,11 @@ clean-local:
 
 dist-local: dist-default
 
-sn_sources = sn.cs StrongNameManager.cs AssemblyInfo.cs $(topdir)/build/common/Consts.cs
-sn.exe $(topdir)/class/lib/$(PROFILE)/sn.exe: $(sn_sources)
-       $(CSCOMPILE) /out:$@ $(sn_sources)
+sn.exe $(topdir)/class/lib/$(PROFILE)/sn.exe: $(SN_SOURCES)
+       $(CSCOMPILE) /out:$@ $(SN_SOURCES)
+
+permview.exe: permview.cs
+       $(CSCOMPILE) $^ $(HELPER_SOURCES) -r:Mono.Cecil.dll
 
-%.exe: %.cs AssemblyInfo.cs $(topdir)/build/common/Consts.cs
+%.exe: %.cs $(HELPER_SOURCES)
        $(CSCOMPILE) $^