diff -Nur guile-gtk-20011121-virgin/Makefile.am guile-gtk-20011121/Makefile.am --- guile-gtk-20011121-virgin/Makefile.am Tue Nov 13 00:06:08 2001 +++ guile-gtk-20011121/Makefile.am Fri Dec 28 22:39:15 2001 @@ -1,26 +1,20 @@ # -*- Makefile -*- -autoconf_macros = gnome-guile-checks.m4 -acinclude.m4: $(autoconf_macros) - cd $(srcdir); \ - cat $(autoconf_macros) > acim.tmp; \ - mv acim.tmp acinclude.m4 - -#bin_PROGRAMS = $(GUILE_GTK_VERSION) +bin_PROGRAMS = $(GUILE_GTK_VERSION) bin_SCRIPTS = build-guile-gtk lib_LTLIBRARIES = $(LIBGUILEGTK_VERSION) $(LIBGUILEDLOPENHELPER) -#EXTRA_PROGRAMS = guile-gtk-1.2 guile-gtk-1.3 +EXTRA_PROGRAMS = guile-gtk-1.2 guile-gtk-1.3 EXTRA_LTLIBRARIES = libguilegtk-1.2.la libguilegtk-1.3.la \ libguiledlopenhelper.la -#guile_gtk_1_2_SOURCES = main.c -#guile_gtk_1_2_LDFLAGS = -export-dynamic -#guile_gtk_1_2_LDADD = libguilegtk-1.2.la $(GUILE_LIBS) $(GTK_LIBS) - -#guile_gtk_1_3_SOURCES = main.c -#guile_gtk_1_3_LDFLAGS = -export-dynamic -#guile_gtk_1_3_LDADD = libguilegtk-1.3.la $(GUILE_LIBS) $(GTK_LIBS) +guile_gtk_1_2_SOURCES = main.c +guile_gtk_1_2_LDFLAGS = -export-dynamic +guile_gtk_1_2_LDADD = libguilegtk-1.2.la $(GUILE_LIBS) $(GTK_LIBS) + +guile_gtk_1_3_SOURCES = main.c +guile_gtk_1_3_LDFLAGS = -export-dynamic +guile_gtk_1_3_LDADD = libguilegtk-1.3.la $(GUILE_LIBS) $(GTK_LIBS) INCLUDES = $(GTK_CFLAGS) -I$(includedir) $(GUILE_INCS) @@ -68,9 +62,9 @@ include_HEADERS = guile-gtk.h -#install-exec-local: -# mkdir -p $(bindir) -# cd $(bindir) && rm -f guile-gtk && $(LN_S) $(GUILE_GTK_VERSION) guile-gtk +install-exec-local: + mkdir -p $(bindir) + cd $(bindir) && rm -f guile-gtk && $(LN_S) $(GUILE_GTK_VERSION) guile-gtk gtkmoduledir = $(datadir)/guile/gtk vgtkmoduledir = $(datadir)/guile/gtk-$(GTK_VERSION) @@ -109,8 +103,8 @@ gdk-glue.c: $(gdkdefs) build-guile-gtk $(BUILD) -I $(srcdir) glue $(gdkdefs) >tmpd && mv tmpd $@ -#main.c: $(gtkdefs) $(gdkdefs) build-guile-gtk -# $(BUILD) -I $(srcdir) main $(gtkdefs) $(gdkdefs) >tmpm && mv tmpm $@ +main.c: $(gtkdefs) $(gdkdefs) build-guile-gtk + $(BUILD) -I $(srcdir) main $(gtkdefs) $(gdkdefs) >tmpm && mv tmpm $@ Makefile: $(BUILT_SOURCES) diff -Nur guile-gtk-20011121-virgin/examples/configure.in guile-gtk-20011121/examples/configure.in --- guile-gtk-20011121-virgin/examples/configure.in Sat Dec 2 13:10:27 2000 +++ guile-gtk-20011121/examples/configure.in Fri Dec 28 22:42:41 2001 @@ -5,14 +5,6 @@ AC_PROG_CC AM_PROG_LIBTOOL -GNOME_COMMON_INIT -GNOME_PLATFORM_GNOME_2(no) - -if test $platform_gnome_2 = yes ; then - GNOME_PKGCONFIG_CHECK_MODULES(GTK, gtk+-2.0:1.3.1) -else - GNOME_PKGCONFIG_CHECK_MODULES(GTK, gtk+:1.2.6) -fi AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS)