preserve automake CFLAGS.

[~andy/gtk] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 6892253c4cf4a90c11acba5ddc1ca8f261fc6f71..39703dc66ef0aeed1ff223936584329e5c3cfa93 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -2,9 +2,9 @@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk.la
+lib_LTLIBRARIES = libgtk-1.1.la
 
-libgtk_la_SOURCES = \
+libgtk_1_1_la_SOURCES = \
        gtkaccelerator.c        \
        gtkadjustment.c         \
        gtkaspectframe.c        \
@@ -20,6 +20,7 @@ libgtk_la_SOURCES = \
        gtkcolorsel.c           \
        gtkcombo.c              \
        gtkcontainer.c          \
+       gtkctree.c              \
        gtkcurve.c              \
        gtkdata.c               \
        gtkdialog.c             \
@@ -113,6 +114,7 @@ gtkinclude_HEADERS = \
        gtkcolorsel.h           \
        gtkcombo.h              \
        gtkcontainer.h          \
+       gtkctree.h              \
        gtkcurve.h              \
        gtkdata.h               \
        gtkdebug.h              \
@@ -122,6 +124,7 @@ gtkinclude_HEADERS = \
        gtkentry.h              \
        gtkenums.h              \
        gtkeventbox.h           \
+       gtkfeatures.h           \
        gtkfilesel.h            \
        gtkfixed.h              \
        gtkframe.h              \
@@ -191,19 +194,21 @@ gtkinclude_HEADERS = \
        gtkwindow.h             \
        gtktypebuiltins.h
 
-../gtk/gtktypebuiltins.h: gtk.defs gentypeinfo.el
+$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
        $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el idmac $< $@
 
-gtktypebuiltins.c: gtk.defs gentypeinfo.el
+$(srcdir)/gtktypebuiltins.c: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
        $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@
 
-libgtk_la_LDFLAGS = -version-info 1:0:0
+libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 EXTRA_DIST = \
        line-arrow.xbm          \
        line-wrap.xbm           \
        testgtkrc               \
+       testgtkrc2              \
        gtk.defs                \
+       gtkfeatures.h.in        \
        runelisp                \
        gentypeinfo.el          \
        gtktypebuiltins.c       \
@@ -218,54 +223,48 @@ EXTRA_DIST = \
        tree_minus.xbm          \
         circles.xbm
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib @x_cflags@ 
+INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@ 
 
 noinst_PROGRAMS = testgtk testinput testselection simple 
-testgtk_LDADD = \
-       libgtk.la                               \
-       $(top_builddir)/gdk/libgdk.la           \
-       @x_ldflags@                             \
-       @x_libs@                                \
-       $(top_builddir)/glib/libglib.la         \
-       -lm
 
-testinput_LDADD = \
-       libgtk.la                               \
-       $(top_builddir)/gdk/libgdk.la           \
-       @x_ldflags@                             \
-       @x_libs@                                \
-       $(top_builddir)/glib/libglib.la         \
-       -lm
+# FIXME, we currently rely on linking against libglib-1.1
 
-testselection_LDADD = \
-       libgtk.la                               \
-       $(top_builddir)/gdk/libgdk.la           \
-       @x_ldflags@                             \
-       @x_libs@                                \
-       $(top_builddir)/glib/libglib.la         \
+DEPS = \
+       libgtk-@LT_RELEASE@.la                          \
+       $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la      \
+       $(top_builddir)/glib/libglib-1.1.la
+LDADDS = \
+       libgtk-@LT_RELEASE@.la                          \
+       $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la      \
+       @x_ldflags@                                     \
+       @x_libs@                                        \
+       $(top_builddir)/glib/libglib-1.1.la             \
        -lm
 
-simple_LDADD = \
-       libgtk.la                               \
-       $(top_builddir)/gdk/libgdk.la           \
-       @x_ldflags@                             \
-       @x_libs@                                \
-       $(top_builddir)/glib/libglib.la         \
-       -lm
-
-DEPS = \
-       $(top_builddir)/gtk/libgtk.la           \
-       $(top_builddir)/gdk/libgdk.la           \
-       $(top_builddir)/glib/libglib.la
-
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
 testselection_DEPENDENCIES = $(DEPS)
 simple_DEPENDENCIES = $(DEPS)
 
-.PHONY: files
+testgtk_LDADD = $(LDADDS)
+testinput_LDADD = $(LDADDS)
+testselection_LDADD = $(LDADDS)
+simple_LDADD = $(LDADDS)
+
+
+.PHONY: files test test-debug
 
 files:
        @files=`ls $(DISTFILES) 2> /dev/null `; for p in $$files; do \
          echo $$p; \
        done
+
+test: testgtk
+       builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
+       cd $$builddir; cd $(srcdir); \
+       $(SHELL) $$top_builddir/libtool --mode=execute $$builddir/testgtk
+
+test-debug: testgtk
+       builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
+       cd $$builddir; cd $(srcdir); \
+       $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk