make distcheck

svn path=/trunk/debugger/; revision=109265

build/Makefile.am

@@ -26,7 +26,7 @@ noinst_SCRIPTS = \
 	Mono.Debugger.Test.dll
 
 LANGUAGE_SPECIFIC_FILES = \
-	$(top_builddir)/frontend/CSharpExpressionParser.cs	\
+	$(top_srcdir)/frontend/CSharpExpressionParser.cs	\
 	$(top_srcdir)/frontend/CSharpTokenizer.cs
 
 MDB_SRCLIST = \
@@ -76,17 +76,17 @@ TEST_CASE_SRCLIST = \
 
 SYMBOL_WRITER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:$(srcdir)/Mono.Cecil.dll
+	-r:./Mono.Cecil.dll
 
 SYMBOL_READER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:$(srcdir)/Mono.Cecil.dll
+	-r:./Mono.Cecil.dll
 
 DEBUGGER_DEPS = \
 	-r:Mono.GetOptions				\
-	-r:Mono.Debugger.SymbolWriter			\
+	-r:./Mono.Debugger.SymbolWriter.dll		\
 	-r:System.Runtime.Serialization.Formatters.Soap	\
-	-r:$(srcdir)/Mono.Cecil.dll
+	-r:./Mono.Cecil.dll
 
 MDB_DEPS = \
 	-r:Mono.GetOptions				\
@@ -103,10 +103,10 @@ if MARTIN_PRIVATE
 MCS_FLAGS += -define:MARTIN_PRIVATE
 endif
 
-Mono.Debugger.SymbolWriter.dll: Makefile $(SYMBOL_WRITER_SRCLIST)
+Mono.Debugger.SymbolWriter.dll: Makefile Mono.Cecil.dll $(SYMBOL_WRITER_SRCLIST)
 	$(MCS) -target:library -out:Mono.Debugger.SymbolWriter.dll -d:CECIL $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk $(SYMBOL_WRITER_DEPS) $(SYMBOL_WRITER_SRCLIST)
 
-Mono.Debugger.dll: Makefile Mono.Debugger.SymbolWriter.dll $(DEBUGGER_SRCLIST)
+Mono.Debugger.dll: Makefile Mono.Cecil.dll Mono.Debugger.SymbolWriter.dll $(DEBUGGER_SRCLIST)
 	$(MCS) -target:library -out:Mono.Debugger.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk -resource:$(top_srcdir)/classes/DebuggerConfiguration.xsd,DebuggerConfiguration $(DEBUGGER_DEPS) $(DEBUGGER_SRCLIST)
 
 Mono.Debugger.Frontend.dll: Makefile $(MDB_SRCLIST) Mono.Debugger.dll
@@ -116,7 +116,7 @@ Mono.Debugger.Test.dll: Makefile $(TEST_SRCLIST) Mono.Debugger.dll Mono.Debugger
 	$(MCS) -target:library -out:Mono.Debugger.Test.dll $(MCS_FLAGS) -keyfile:$(top_srcdir)/build/mono.snk $(TEST_DEPS) $(TEST_SRCLIST)
 
 Mono.Cecil.dll:
-	cp $(CECIL_ASM) $(srcdir)
+	cp $(CECIL_ASM) $(builddir)
 
 mdb.exe: Makefile $(MDB_SRCLIST) Mono.Debugger.dll
 	$(MCS) -out:mdb.exe $(MDB_DEPS) $(MDB_SRCLIST) $(MCS_FLAGS)

configure.in

@@ -216,7 +216,7 @@ fi
 AC_SUBST(TARGET_MCS)
 AC_SUBST(TARGET_MONO)
 
-real_top_srcdir=`pwd`
+real_top_srcdir=`cd $srcdir && pwd`
 AC_SUBST(real_top_srcdir)
 AC_SUBST(PATH)
 AC_SUBST(LD_LIBRARY_PATH)

frontend/Makefile.am

@@ -1,13 +1,16 @@
 SUBDIRS = jay libedit
 
-noinst_DATA = $(top_builddir)/frontend/CSharpExpressionParser.cs
+if MAINTAINER_MODE
+noinst_DATA = $(real_top_srcdir)/frontend/CSharpExpressionParser.cs
 
 JAY = jay/jay
 CSLEX = $(top_builddir)/cslex/cslex.exe
 
-$(top_builddir)/frontend/CSharpExpressionParser.cs: CSharpExpressionParser.jay $(srcdir)/skeleton
-	$(JAY) -ctv < $(srcdir)/skeleton $(real_top_srcdir)/frontend/CSharpExpressionParser.jay > tmp-p && mv -f tmp-p $(top_builddir)/frontend/CSharpExpressionParser.cs
+$(real_top_srcdir)/frontend/CSharpExpressionParser.cs: $(real_top_srcdir)/frontend/CSharpExpressionParser.jay $(srcdir)/skeleton
+	echo $(real_top_srcdir)
+	$(JAY) -ctv < $(srcdir)/skeleton $(real_top_srcdir)/frontend/CSharpExpressionParser.jay > tmp-p && mv -f tmp-p $(real_top_srcdir)/frontend/CSharpExpressionParser.cs
 
 DISTCLEANFILES = CSharpExpressionParser.cs y.output
+endif
 
-EXTRA_DIST = skeleton CSharpExpressionParser.jay *.cs
+EXTRA_DIST = skeleton CSharpExpressionParser.jay CSharpExpressionParser.cs *.cs