X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=scripts%2FMakefile.am;h=8aa56b4197b5b34cfad908031ef3616406f617e7;hb=feca28835d4e3cb2be67bdcbd4f54fee62c3797a;hp=a2f50a04fc28beaca6910691a7e3423240a1de38;hpb=ff228e1c801bda9666b6edab3ee962e05edcf480;p=mono.git

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index a2f50a04fc2..8aa56b4197b 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,10 +1,13 @@
-EXTRA_DIST = script.in script2.in mono-service.in mono-nunit.pc.in
-DISTCLEANFILES = mono-nunit.pc
-
-bin2dir = $(bindir)
-servicedir = $(bindir)
-
 bin_SCRIPTS = \
+	$(scripts_1_0)		\
+	$(scripts_1_0_umask)	\
+	$(scripts_2_0)		\
+	$(scripts_2_1)		\
+	$(scripts_service)	\
+	$(scripts_nunit)	\
+	$(scripts_rpmhelpers)
+
+scripts_1_0 = \
 	al			\
 	caspol			\
 	cert2spc		\
@@ -13,74 +16,128 @@ bin_SCRIPTS = \
 	cilc			\
 	disco			\
 	dtd2xsd			\
+	dtd2rng			\
 	gacutil			\
 	genxs			\
 	ilasm			\
-	makecert		\
+	installvst		\
 	macpack			\
 	mbas			\
 	mcs			\
 	mjs			\
 	mkbundle		\
-	mono-find-provides	\
-	mono-find-requires	\
 	monop			\
-	monoresgen		\
+	mono-api-diff 		\
+	mono-api-info 		\
+	mono-shlib-cop 		\
+	mono-xmltool		\
+	mozroots		\
 	permview		\
 	prj2make		\
 	resgen			\
 	secutil			\
 	setreg			\
 	signcode		\
-	sn			\
 	soapsuds		\
 	sqlsharp		\
 	wsdl			\
 	xsd
 
-bin2_SCRIPTS = gmcs wsdl2
+scripts_1_0_umask = \
+	makecert		\
+	sn
 
-service_SCRIPTS = mono-service
+scripts_2_0 = \
+	al2			\
+	gmcs			\
+	httpcfg			\
+	ilasm2			\
+	mkbundle2		\
+	mono-api-info2 		\
+	monop2 			\
+	resgen2			\
+	wsdl2			\
+	sgen			\
+	xbuild
 
-CLEANFILES = $(bin_SCRIPTS) $(bin2_SCRIPTS)
+scripts_2_1 = smcs
+scripts_service = mono-service mono-service2
+scripts_nunit = nunit-console nunit-console2
+scripts_rpmhelpers = mono-find-provides mono-find-requires
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= mono-nunit.pc
+
+CLEANFILES = $(scripts_1_0) $(scripts_1_0_umask) $(scripts_2_0) $(scripts_2_1) gmcs mono-service mono-service2
+DISTCLEANFILES = $(pkgconfig_DATA) $(scripts_rpmhelpers)
+
+EXTRA_DIST =                   \
+	script.in              \
+	script_umask.in        \
+	smcs.in			\
+	mono-service.in        \
+	mono-nunit.pc.in       \
+	mono-find-provides.in  \
+	mono-find-requires.in
 
 if USE_JIT
-MONO_INTERP = mono
+mono_interp = mono
 else
-MONO_INTERP = mint
+mono_interp = mint
 endif
 
 if PLATFORM_WIN32
 plat_bindir = $(shell cygpath -m $(libdir))
-mono_one_instdir = $(shell cygpath -m $(libdir))/mono/1.0
-mono_two_instdir = $(shell cygpath -m $(libdir))/mono/2.0
+mono_instdir = $(shell cygpath -m $(libdir))/mono
 else
 plat_bindir = $(bindir)
-mono_one_instdir = $(prefix)/lib/mono/1.0
-mono_two_instdir = $(prefix)/lib/mono/2.0
+mono_instdir = $(prefix)/lib/mono
 endif
 
-REWRITE = sed \
+REWRITE_COMMON = sed \
 	-e 's,@''bindir@,$(bindir),g'				\
 	-e 's,@''plat_bindir@,$(plat_bindir),g'			\
-	-e 's,@''mono_one_instdir@,$(mono_one_instdir),g'	\
-	-e 's,@''mono_two_instdir@,$(mono_two_instdir),g'	\
-	-e 's,@''gtkdir@,$(gtkdir),g'				\
-	-e 's,@''exe_file@,$@.exe,g'				\
-	-e 's,@''mono_interp@,$(MONO_INTERP),g'
+	-e 's,@''mono_instdir@,$(mono_instdir),g'		\
+	-e 's,@''gtkdir@,$(gtkdir),g'
+
+REWRITE = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp),g'
+REWRITE_DEBUG = $(REWRITE_COMMON) -e 's,@''mono_interp@,$(mono_interp) --debug,g'
+
+REWRITE1 = $(REWRITE) -e 's,@''framework_version@,1.0,g'
+REWRITE2 = $(REWRITE) -e 's,@''framework_version@,2.0,g'
+REWRITE2_1 = $(REWRITE) -e 's,@''framework_version@,2.1,g'
+REWRITE1_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,1.0,g'
+REWRITE2_DEBUG = $(REWRITE_DEBUG) -e 's,@''framework_version@,2.0,g'
 
 mono-service: mono-service.in Makefile
-	$(REWRITE) $(srcdir)/mono-service.in > $@.tmp
+	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
 	mv $@.tmp $@
 
-$(bin_SCRIPTS): script.in Makefile
-	$(REWRITE) $(srcdir)/script.in > $@.tmp
+mono-service2: mono-service.in Makefile
+	$(REWRITE2) -e 's,@''exe_name@,$@,g' $(srcdir)/mono-service.in > $@.tmp
 	mv $@.tmp $@
 
-$(bin2_SCRIPTS): script2.in Makefile
-	$(REWRITE) $(srcdir)/script2.in > $@.tmp
+nunit-console: script.in Makefile
+	$(REWRITE1_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/script.in > $@.tmp
 	mv $@.tmp $@
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA= mono-nunit.pc
+nunit-console2: script.in Makefile
+	$(REWRITE2_DEBUG) -e 's,@''exe_name@,nunit-console,g' $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@
+
+smcs: smcs.in Makefile
+	$(REWRITE2_1) -e "s,@""exe_name@,gmcs,g" $(srcdir)/smcs.in > $@.tmp
+	mv $@.tmp $@
 
+$(scripts_1_0): script.in Makefile
+	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@
+
+$(scripts_1_0_umask): script_umask.in Makefile
+	$(REWRITE1) -e 's,@''exe_name@,$@,g' $(srcdir)/script_umask.in > $@.tmp
+	mv $@.tmp $@
+
+$(scripts_2_0): script.in Makefile
+	n=`echo $@ | sed 's,2$$,,'`; \
+	$(REWRITE2) -e "s,@""exe_name@,$$n,g" $(srcdir)/script.in > $@.tmp
+	mv $@.tmp $@