* glue/Makefile.am (pkglib_LTLIBRARIES): install libsteticglue.la

	* libstetic/Makefile.am (pkglib_DATA): install libstetic.dll and
	libstetic.dll.config
	(libstetic.dll): update to non-warned-about mcs option syntax
	(CLEANFILES, EXTRA_DIST): update
	
	* libstetic/libstetic.dll.config: remove unused mapping

	* libstetic/wrapper/pixmaps/Makefile.am: remove unused Makefile

	* stetic/Makefile.am (pkglib_DATA, bin_DATA): install stetic and
	stetic.exe
	(stetic.exe): update to non-warned-about mcs option syntax
	(CLEANFILES, EXTRA_DIST): update
	(run, trace, mdb, gdb): targets to run the uninstalled stetic.exe

	* stetic/stetic.in: redo this for installation

	* stetic/stetic.exe.config: remove this; stetic.exe doesn't
	DllImport anything of its own

	* configure.in: remove unused GACUTIL checks

svn path=/trunk/stetic/; revision=43599

ChangeLog

@@ -1,3 +1,29 @@
+2005-04-26  Dan Winship  <danw@novell.com>
+
+	* glue/Makefile.am (pkglib_LTLIBRARIES): install libsteticglue.la
+
+	* libstetic/Makefile.am (pkglib_DATA): install libstetic.dll and
+	libstetic.dll.config
+	(libstetic.dll): update to non-warned-about mcs option syntax
+	(CLEANFILES, EXTRA_DIST): update
+
+	* libstetic/libstetic.dll.config: remove unused mapping
+
+	* libstetic/wrapper/pixmaps/Makefile.am: remove unused Makefile
+
+	* stetic/Makefile.am (pkglib_DATA, bin_DATA): install stetic and
+	stetic.exe
+	(stetic.exe): update to non-warned-about mcs option syntax
+	(CLEANFILES, EXTRA_DIST): update
+	(run, trace, mdb, gdb): targets to run the uninstalled stetic.exe
+
+	* stetic/stetic.in: redo this for installation
+
+	* stetic/stetic.exe.config: remove this; stetic.exe doesn't
+	DllImport anything of its own
+
+	* configure.in: remove unused GACUTIL checks
+
 2005-04-20  Dan Winship  <danw@novell.com>
 
 	* libstetic/wrapper/CheckMenuItem.cs: 

configure.in

@@ -21,16 +21,8 @@ if test "$MCS" = "no" ; then
 	AC_MSG_ERROR([No $CS compiler found])
 fi
 
-AC_PATH_PROG(GACUTIL, gacutil, no)
-if test "x$GACUTIL" = "xno" ; then
-	AC_MSG_ERROR([No gacutil tool found])
-fi
-GACUTIL_FLAGS='/package $(PACKAGE_VERSION) /gacdir $(DESTDIR)$(libdir)'
-
 AC_SUBST(MONO)
 AC_SUBST(MCS)
-AC_SUBST(GACUTIL)
-AC_SUBST(GACUTIL_FLAGS)
 
 PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4)
 AC_SUBST(GTK_CFLAGS)

glue/Makefile.am

@@ -1,6 +1,6 @@
 INCLUDES = $(GTK_CFLAGS)
 
-lib_LTLIBRARIES = libsteticglue.la
+pkglib_LTLIBRARIES = libsteticglue.la
 
 libsteticglue_la_LDFLAGS = -module -avoid-version -no-undefined
 libsteticglue_la_LIBADD = $(GTK_LIBS)

libstetic/Makefile.am

@@ -1,4 +1,4 @@
-noinst_DATA = libstetic.dll
+pkglib_DATA = libstetic.dll libstetic.dll.config
 
 libstetic_dll_sources =			\
 	CommandAttribute.cs		\
@@ -109,6 +109,12 @@ libstetic.dll: $(libstetic_dll_sources)
 	@rm -f sources.rsp
 	@echo $(libstetic_dll_sources) > sources.rsp
 	@for pixmap in $(srcdir)/wrapper/pixmaps/*.png; do echo -resource:$$pixmap,`basename $$pixmap` >> sources.rsp; done
-	$(MCS) -g -pkg:gnome-sharp-2.0 -target:library -o $@ @sources.rsp
+	$(MCS) -debug -pkg:gnome-sharp-2.0 -target:library -out:$@ @sources.rsp
 
-CLEANFILES = libstetic.dll libstetic.dll.mdb
+CLEANFILES = libstetic.dll libstetic.dll.mdb sources.rsp
+
+EXTRA_DIST =				\
+	$(libstetic_dll_sources)	\
+	libstetic.dll.config		\
+	wrapper/pixmaps/COPIED		\
+	wrapper/pixmaps/*.png

libstetic/libstetic.dll.config

@@ -1,5 +1,4 @@
 <configuration>
   <dllmap dll="libgobject-2.0-0.dll" target="libgobject-2.0.so.0"/>
-  <dllmap dll="libglibsharpglue-2.0.dll" target="libglibsharpglue-2.0.so"/>
   <dllmap dll="libgtk-win32-2.0-0.dll" target="libgtk-x11-2.0.so.0"/>
 </configuration>

stetic/Makefile.am

@@ -1,7 +1,7 @@
-noinst_PROGRAMS = stetic.exe
-noinst_SCRIPTS = stetic
+pkglib_DATA = stetic.exe
+bin_SCRIPTS = stetic
 
-stetic_exe_SOURCES =			\
+stetic_exe_sources =			\
 	ContextMenu.cs			\
 	Glade.cs			\
 	Grid.cs				\
@@ -17,11 +17,25 @@ comma = ,
 ICON_FILES = $(wildcard $(srcdir)/*.png)
 ICON_RESOURCES = $(foreach file,$(ICON_FILES),-resource:$(file)$(comma)$(notdir $(file)))
 
-stetic.exe: $(stetic_exe_SOURCES) $(ICON_FILES) ../libstetic/libstetic.dll
-	$(MCS) -g -pkg:gnome-sharp-2.0 -r:../libstetic/libstetic.dll -o stetic.exe $(stetic_exe_SOURCES) $(ICON_RESOURCES)
+stetic.exe: $(stetic_exe_sources) $(ICON_FILES) ../libstetic/libstetic.dll
+	$(MCS) -debug -pkg:gnome-sharp-2.0 -r:../libstetic/libstetic.dll -out:stetic.exe $(stetic_exe_sources) $(ICON_RESOURCES)
 
 stetic: stetic.in
-	sed -e "s:\@MONO\@:$(MONO):" $< > $@
+	sed -e "s:\@MONO\@:$(MONO):" -e "s:\@pkglibdir\@:$(pkglibdir):" $< > $@
 	chmod a+x $@
 
-CLEANFILES = stetic stetic.exe.mdb
+EXTRA_DIST = $(stetic_exe_sources) *.png stetic.in
+
+CLEANFILES = stetic stetic.exe stetic.exe.mdb
+
+run:
+	LD_LIBRARY_PATH=../glue/.libs:$$LD_LIBRARY_PATH MONO_PATH=../libstetic $(MONO) --debug stetic.exe
+
+trace:
+	LD_LIBRARY_PATH=../glue/.libs:$$LD_LIBRARY_PATH MONO_PATH=../libstetic $(MONO) --trace --debug stetic.exe
+
+mdb:
+	LD_LIBRARY_PATH=../glue/.libs:/opt/debug/lib:$$LD_LIBRARY_PATH MONO_PATH=../libstetic mdb stetic.exe
+
+gdb:
+	LD_LIBRARY_PATH=../glue/.libs:/opt/debug/lib:$$LD_LIBRARY_PATH MONO_PATH=../libstetic gdb $(MONO)

stetic/stetic.in

@@ -1,5 +1,4 @@
 #!/bin/sh
 
-export LD_LIBRARY_PATH=../glue/.libs:$LD_LIBRARY_PATH
-export MONO_PATH=../libstetic:../widgets
-exec @MONO@ "$@" --debug stetic.exe
+export LD_LIBRARY_PATH=@pkglibdir@:$LD_LIBRARY_PATH
+exec @MONO@ "$@" @pkglibdir@/stetic.exe