From abbec2b64919ce3cabbd6503998859735e1fb4e4 Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Mon, 11 Apr 2005 14:56:29 +0000 Subject: [PATCH] * configure.in: Add an --enable-debug flag, to build .mdb files for all of the assemblies * Makefile.include: * gconf/GConf/Makefile.am: * gconf/GConf.PropertyEditors/Makefile.am: * glib/Makefile.am: * gtkdotnet/Makefile.am (CLEANFILES): add $(ASSEMBLY).mdb $(ASSEMBLY): build with $(CSFLAGS). Always delete $(ASSEMBLY).mdb before building $(ASSEMBLY), so that if you first build with debugging enabled, then update, then rebuild without debugging enabled, you don't end up with an out-of-date .mdb file. svn path=/trunk/gtk-sharp/; revision=42791 --- ChangeLog | 15 +++++++++++++++ Makefile.include | 5 +++-- configure.in | 7 ++++++- gconf/GConf.PropertyEditors/Makefile.am | 5 +++-- gconf/GConf/Makefile.am | 5 +++-- glib/Makefile.am | 5 +++-- gtkdotnet/Makefile.am | 5 +++-- 7 files changed, 36 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 85a575b16..f496e260c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2005-04-08 Dan Winship + + * configure.in: Add an --enable-debug flag, to build .mdb files + for all of the assemblies + + * Makefile.include: + * gconf/GConf/Makefile.am: + * gconf/GConf.PropertyEditors/Makefile.am: + * glib/Makefile.am: + * gtkdotnet/Makefile.am (CLEANFILES): add $(ASSEMBLY).mdb + $(ASSEMBLY): build with $(CSFLAGS). Always delete $(ASSEMBLY).mdb + before building $(ASSEMBLY), so that if you first build with + debugging enabled, then update, then rebuild without debugging + enabled, you don't end up with an out-of-date .mdb file. + 2005-04-08 Alp Toker * atk/makefile.win32: gapi-cdecl-insert was called in the wrong place diff --git a/Makefile.include b/Makefile.include index da271aabd..0af763819 100644 --- a/Makefile.include +++ b/Makefile.include @@ -10,7 +10,7 @@ noinst_DATA = $(TARGET) TARGET_API = $(pkg:=-api.xml) gapidir = $(datadir)/gapi-2.0 gapi_DATA = $(TARGET_API) -CLEANFILES = $(ASSEMBLY) generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb generated-stamp generated/*.cs $(API) glue/generated.c $(SNK) DISTCLEANFILES = $(ASSEMBLY).config EXTRA_DIST = $(RAW_API) $(SYMBOLS) $(ASSEMBLY).config.in $(METADATA) $(customs) $(sources) $(add_dist) @@ -43,7 +43,8 @@ build_sources = $(addprefix $(srcdir)/, $(sources)) $(top_builddir)/AssemblyInfo build_references = $(addprefix /r:, $(references)) $(ASSEMBLY): generated-stamp $(SNK) $(build_sources) $(references) - $(CSC) -nowarn:0612 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources) $(GENERATED_SOURCES) + @rm -f $(ASSEMBLY).mdb + $(CSC) $(CSFLAGS) -nowarn:0612 -nowarn:0618 -unsafe -out:$(ASSEMBLY) -target:library $(build_references) $(build_sources) $(GENERATED_SOURCES) install-data-local: @if test -n '$(pkg)'; then \ diff --git a/configure.in b/configure.in index c8a1000a7..e45feda8d 100644 --- a/configure.in +++ b/configure.in @@ -39,6 +39,11 @@ AC_CHECK_SIZEOF(void *, 4) CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings' +AC_ARG_ENABLE(debug, [ --enable-debug Build debugger (.mdb) files for dlls], + CSFLAGS='-g' +) +AC_SUBST(CSFLAGS) + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) if test "x$PKG_CONFIG" = "xno"; then AC_MSG_ERROR([You need to install pkg-config]) @@ -300,7 +305,7 @@ echo "---" echo "Configuration summary" echo "" echo " * Installation prefix = $prefix" -echo " * $CS compiler: $CSC" +echo " * $CS compiler: $CSC $CSFLAGS" echo "" echo " Optional assemblies included in the build:" echo "" diff --git a/gconf/GConf.PropertyEditors/Makefile.am b/gconf/GConf.PropertyEditors/Makefile.am index 08b36e419..66ba56c15 100644 --- a/gconf/GConf.PropertyEditors/Makefile.am +++ b/gconf/GConf.PropertyEditors/Makefile.am @@ -7,7 +7,7 @@ endif ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = gconf-sharp-peditors noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) gtk-sharp.snk +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk EXTRA_DIST = \ PropertyEditorColorPicker.cs \ @@ -34,7 +34,8 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . $(ASSEMBLY): $(build_sources) gtk-sharp.snk - $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + @rm -f $(ASSEMBLY).mdb + $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \ diff --git a/gconf/GConf/Makefile.am b/gconf/GConf/Makefile.am index 893ccde94..2007ae976 100644 --- a/gconf/GConf/Makefile.am +++ b/gconf/GConf/Makefile.am @@ -6,7 +6,7 @@ else TARGET = endif noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) gtk-sharp.snk +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk DISTCLEANFILES = gconf-sharp-2.0.pc $(ASSEMBLY).config ASSEMBLY = $(ASSEMBLY_NAME).dll @@ -38,7 +38,8 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . $(ASSEMBLY): $(build_sources) gtk-sharp.snk - $(CSC) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + @rm -f $(ASSEMBLY).mdb + $(CSC) $(CSFLAGS) /out:$(ASSEMBLY) /target:library $(references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \ diff --git a/glib/Makefile.am b/glib/Makefile.am index 9ffa89eb3..c1b79799e 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -4,7 +4,7 @@ TARGET = $(ASSEMBLY) ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = glib-sharp noinst_DATA = $(ASSEMBLY) $(ASSEMBLY).config -CLEANFILES = $(ASSEMBLY) gtk-sharp.snk +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config references = @@ -65,7 +65,8 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . $(ASSEMBLY): $(build_sources) gtk-sharp.snk - $(CSC) /nowarn:0612 /out:$(ASSEMBLY) /target:library $(references) $(build_sources) + @rm -f $(ASSEMBLY).mdb + $(CSC) $(CSFLAGS) /nowarn:0612 /out:$(ASSEMBLY) /target:library $(references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \ diff --git a/gtkdotnet/Makefile.am b/gtkdotnet/Makefile.am index d8a25745f..13ff72095 100644 --- a/gtkdotnet/Makefile.am +++ b/gtkdotnet/Makefile.am @@ -9,7 +9,7 @@ endif ASSEMBLY = $(ASSEMBLY_NAME).dll ASSEMBLY_NAME = gtk-dotnet noinst_DATA = $(TARGET) -CLEANFILES = $(ASSEMBLY) gtk-sharp.snk +CLEANFILES = $(ASSEMBLY) $(ASSEMBLY).mdb gtk-sharp.snk DISTCLEANFILES = $(ASSEMBLY).config references = ../glib/glib-sharp.dll ../pango/pango-sharp.dll ../gdk/gdk-sharp.dll @@ -30,7 +30,8 @@ gtk-sharp.snk: $(top_srcdir)/gtk-sharp.snk cp $(top_srcdir)/gtk-sharp.snk . $(ASSEMBLY): $(build_sources) $(references) gtk-sharp.snk - $(CSC) /nowarn:0612 /out:$(ASSEMBLY) /target:library $(build_references) $(build_sources) + @rm -f $(ASSEMBLY).mdb + $(CSC) $(CSFLAGS) /nowarn:0612 /out:$(ASSEMBLY) /target:library $(build_references) $(build_sources) install-data-local: @if test -n '$(TARGET)'; then \