X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftools%2Fsecurity%2FMakefile;h=c9baa67ccfeeb03264046f7da6961b7ffc78692c;hb=0aedc3f6fb2194817c766659c50a7e7f4786672e;hp=011089a545eb083bb9e1ebcac2f1e085bba4bbb1;hpb=bf04ac6da740b4c970205668208375fc22c348f1;p=mono.git

diff --git a/mcs/tools/security/Makefile b/mcs/tools/security/Makefile
index 011089a545e..c9baa67ccfe 100644
--- a/mcs/tools/security/Makefile
+++ b/mcs/tools/security/Makefile
@@ -3,36 +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
 
-SECURITY_PROGRAMS = secutil.exe cert2spc.exe sn.exe MakeCert.exe chktrust.exe signcode.exe setreg.exe certmgr.exe caspol.exe permview.exe
-SECURITY_SOURCES = AssemblyInfo.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
+SECURITY_PROGRAMS_2_0 = httpcfg.exe
 
-PROGRAM_INSTALL_DIR = $(libdir)/mono/$(FRAMEWORK_VERSION)
+HELPER_SOURCES = AssemblyInfo.cs $(topdir)/build/common/Consts.cs
+SN_SOURCES = sn.cs StrongNameManager.cs $(HELPER_SOURCES)
 
-DISTFILES = README $(SECURITY_SOURCES)
+SECURITY_SOURCES = $(HELPER_SOURCES) $(SN_SOURCES) $(SECURITY_PROGRAMS:.exe=.cs) $(SECURITY_PROGRAMS_2_0:.exe=.cs)
 
-ifeq (net_1_1_bootstrap, $(PROFILE))
+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 (build, $(PROFILE))
 all-local: $(topdir)/class/lib/$(PROFILE)/sn.exe
 else
-all-local: $(SECURITY_PROGRAMS)
+all-local: $(SECURITY_TARGETS)
 endif
 
-install-local: $(SECURITY_PROGRAMS)
+doc-update-local:
+
+install-local: all-local
+uninstall-local:
+
+ifndef NO_INSTALL
+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
@@ -40,9 +57,11 @@ clean-local:
 
 dist-local: dist-default
 
-sn_sources = sn.cs StrongNameManager.cs AssemblyInfo.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
+%.exe: %.cs $(HELPER_SOURCES)
 	$(CSCOMPILE) $^