]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Incremented version to 1.2.0. -Shawn <amundson@gtk.org>
[~andy/gtk] / gtk / Makefile.am
index 673d8ce909c4cd60ebd7b80a9ffc979c1ab1362f..d55b7bd71fb0c81d72f50cbb1204bbcbec09de84 100644 (file)
@@ -2,20 +2,22 @@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk-1.1.la
+lib_LTLIBRARIES = libgtk.la
 
-libgtk_1_1_la_SOURCES = \
+static_SOURCES = \
        gtkaccelgroup.c         \
        gtkaccellabel.c         \
        gtkadjustment.c         \
-       gtkaspectframe.c        \
        gtkalignment.c          \
+       gtkarg.c                \
        gtkarrow.c              \
+       gtkaspectframe.c        \
        gtkbin.c                \
        gtkbindings.c           \
        gtkbbox.c               \
        gtkbox.c                \
        gtkbutton.c             \
+       gtkcalendar.c           \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
        gtkclist.c              \
@@ -26,12 +28,14 @@ libgtk_1_1_la_SOURCES = \
        gtkcurve.c              \
        gtkdata.c               \
        gtkdialog.c             \
+       gtkdnd.c                \
        gtkdrawingarea.c        \
        gtkeditable.c           \
        gtkentry.c              \
        gtkeventbox.c           \
        gtkfilesel.c            \
        gtkfixed.c              \
+       gtkfontsel.c            \
        gtkframe.c              \
        gtkgamma.c              \
        gtkgc.c                 \
@@ -45,13 +49,15 @@ libgtk_1_1_la_SOURCES = \
        gtkhseparator.c         \
        gtkimage.c              \
        gtkinputdialog.c        \
+       gtkintl.h               \
+       gtkinvisible.c          \
        gtkitem.c               \
        gtkitemfactory.c        \
        gtklabel.c              \
+       gtklayout.c             \
        gtklist.c               \
        gtklistitem.c           \
        gtkmain.c               \
-       gtkmarshal.c            \
        gtkmenu.c               \
        gtkmenubar.c            \
        gtkmenufactory.c        \
@@ -61,9 +67,12 @@ libgtk_1_1_la_SOURCES = \
        gtknotebook.c           \
        gtkobject.c             \
        gtkoptionmenu.c         \
+       gtkpacker.c             \
        gtkpaned.c              \
        gtkpixmap.c             \
+       gtkplug.c               \
        gtkpreview.c            \
+       gtkprogress.c           \
        gtkprogressbar.c        \
        gtkradiobutton.c        \
        gtkradiomenuitem.c      \
@@ -76,11 +85,14 @@ libgtk_1_1_la_SOURCES = \
        gtkselection.c          \
        gtkseparator.c          \
        gtksignal.c             \
+       gtksocket.c             \
        gtkspinbutton.c         \
        gtkstyle.c              \
        gtkstatusbar.c          \
        gtktable.c              \
+       gtktearoffmenuitem.c    \
        gtktext.c               \
+       gtkthemes.c             \
        gtktipsquery.c          \
        gtktogglebutton.c       \
        gtktoolbar.c            \
@@ -101,38 +113,47 @@ libgtk_1_1_la_SOURCES = \
        fnmatch.c               \
        fnmatch.h
 
-gtkinclude_HEADERS = \
+libgtk_la_SOURCES = \
+       $(static_SOURCES)       \
+       gtkmarshal.c
+
+# Source headers which are non-autogenerated headers
+source_headers = \
        gtk.h                   \
        gtkaccelgroup.h         \
        gtkaccellabel.h         \
        gtkadjustment.h         \
-       gtkaspectframe.h        \
        gtkalignment.h          \
+       gtkarg.h                \
        gtkarrow.h              \
+       gtkaspectframe.h        \
        gtkbin.h                \
        gtkbindings.h           \
        gtkbbox.h               \
        gtkbox.h                \
        gtkbutton.h             \
+       gtkcalendar.h           \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
        gtkclist.h              \
        gtkcolorsel.h           \
        gtkcombo.h              \
+       gtkcompat.h             \
        gtkcontainer.h          \
        gtkctree.h              \
        gtkcurve.h              \
        gtkdata.h               \
        gtkdebug.h              \
        gtkdialog.h             \
+       gtkdnd.h                \
        gtkdrawingarea.h        \
        gtkeditable.h           \
        gtkentry.h              \
        gtkenums.h              \
        gtkeventbox.h           \
-       gtkfeatures.h           \
        gtkfilesel.h            \
        gtkfixed.h              \
+       gtkfontsel.h            \
        gtkframe.h              \
        gtkgamma.h              \
        gtkgc.h                 \
@@ -146,13 +167,14 @@ gtkinclude_HEADERS = \
        gtkhseparator.h         \
        gtkimage.h              \
        gtkinputdialog.h        \
+       gtkinvisible.h          \
        gtkitem.h               \
        gtkitemfactory.h        \
        gtklabel.h              \
+       gtklayout.h             \
        gtklist.h               \
        gtklistitem.h           \
        gtkmain.h               \
-       gtkmarshal.h            \
        gtkmenu.h               \
        gtkmenubar.h            \
        gtkmenufactory.h        \
@@ -162,10 +184,13 @@ gtkinclude_HEADERS = \
        gtknotebook.h           \
        gtkobject.h             \
        gtkoptionmenu.h         \
+       gtkpacker.h             \
        gtkpaned.h              \
        gtkpixmap.h             \
+       gtkplug.h               \
        gtkpreview.h            \
        gtkprivate.h            \
+       gtkprogress.h           \
        gtkprogressbar.h        \
        gtkradiobutton.h        \
        gtkradiomenuitem.h      \
@@ -178,11 +203,14 @@ gtkinclude_HEADERS = \
        gtkselection.h          \
        gtkseparator.h          \
        gtksignal.h             \
+       gtksocket.h             \
        gtkspinbutton.h         \
        gtkstyle.h              \
        gtkstatusbar.h          \
        gtktable.h              \
+       gtktearoffmenuitem.h    \
        gtktext.h               \
+       gtkthemes.h             \
        gtktipsquery.h          \
        gtktogglebutton.h       \
        gtktoolbar.h            \
@@ -199,58 +227,127 @@ gtkinclude_HEADERS = \
        gtkvscrollbar.h         \
        gtkvseparator.h         \
        gtkwidget.h             \
-       gtkwindow.h             \
+       gtkwindow.h
+
+gtkinclude_HEADERS =           \
+       $(source_headers)       \
+       gtkfeatures.h           \
+       gtkmarshal.h            \
        gtktypebuiltins.h
 
-auto-files:
-       make $(srcdir)/gtk.defs
-       make $(srcdir)/gtktypebuiltins1.c
-       make $(srcdir)/gtktypebuiltins2.c
-       make $(srcdir)/gtktypebuiltins.h
+# note gtk.defs, gtktypebuiltin* and gtkmarshal.[ch] aren't here, but
+# their stamps are.  Another trick is to use the temporary output files as
+# the stamp files.
+BUILT_SOURCES = \
+       s-gd s-gtb s-gtbv s-gtbi s-gtbe \
+       stamp-m 
+
+# cause the built sources to be rebuild when possible, even with --include-deps
+$(static_sources): $(BUILT_SOURCES)
+
+# More headers to use when autogenerating.
+gdk_headers = \
+       ../gdk/gdktypes.h \
+       ../gdk/gdkrgb.h
+
+# generate gtk.defs file from gtk-boxed.defs and *.h
+gtk.defs: @REBUILD@ s-gd
+       @:
+s-gd: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+       cd $(srcdir) \
+       && $(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) > s-gd \
+       && cat gtk-boxed.defs >> s-gd \
+       && (cmp -s s-gd gtk.defs || cp s-gd gtk.defs)
 
-$(srcdir)/gtk.defs: @MAINT@
-       $(COMPILE) -E -DG_CODE_GENERATION $(srcdir)/makeenums.h $(CFLAGS) | \
-         awk -f $(srcdir)/makeenums.awk - defs > $@
-       cat $(srcdir)/gtk-boxed.defs >> $@
+# generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
+gtktypebuiltins.h: @REBUILD@ s-gtb
+       @:
+s-gtb: @REBUILD@ s-gd maketypes.awk
+       cd $(srcdir) \
+       && $(AWK) -f maketypes.awk gtk.defs macros > s-gtb \
+       && (cmp -s s-gtb gtktypebuiltins.h || cp s-gtb gtktypebuiltins.h)
+
+# generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
+gtktypebuiltins_vars.c: @REBUILD@ s-gtbv
+       @:
+s-gtbv: @REBUILD@ s-gd maketypes.awk
+       cd $(srcdir) \
+       && $(AWK) -f maketypes.awk gtk.defs variables > s-gtbv \
+       && (cmp -s s-gtbv gtktypebuiltins_vars.c || cp s-gtbv gtktypebuiltins_vars.c)
+
+# generate type entries for type-id registration
+gtktypebuiltins_ids.c: @REBUILD@ s-gtbi
+       @:
+s-gtbi: @REBUILD@ s-gd maketypes.awk
+       cd $(srcdir) \
+       && $(AWK) -f maketypes.awk gtk.defs entries > s-gtbi \
+       && (cmp -s s-gtbi gtktypebuiltins_ids.c || cp s-gtbi gtktypebuiltins_ids.c)
+
+# generate enum value arrays
+gtktypebuiltins_evals.c: @REBUILD@ s-gtbe 
+       @:
+s-gtbe: @REBUILD@ makeenums.pl s-gd
+       cd $(srcdir) \
+       && $(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) > \
+       s-gtbe \
+       && (cmp -s s-gtbe gtktypebuiltins_evals.c || cp s-gtbe gtktypebuiltins_evals.c)
+
+$(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m
+       @:
+stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl
+       (srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \
+       && (cmp -s s-gmc gtkmarshal.c || mv s-gmc gtkmarshal.c) \
+       && rm -f s-gmc \
+       && (cmp -s s-gmh gtkmarshal.h || mv s-gmh gtkmarshal.h) \
+       && rm -f s-gmh) \
+       && echo timestamp > stamp-m
+
+libgtk_la_LDFLAGS = \
+       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)    \
+       -release $(LT_RELEASE)                                  \
+       @GLIB_DEPLIBS@                                          \
+       @x_ldflags@                                             \
+       @x_libs@                                                \
+       -lm
+#      $(top_builddir)/gdk/libgdk.la
+
+gtkconfdir = $(sysconfdir)/gtk
+gtkconf_DATA = gtkrc gtkrc.ja gtkrc.ko gtkrc.ru
+
+gtkrc:
+       :
        
-$(srcdir)/gtktypebuiltins1.c: @MAINT@
-       $(COMPILE) -E -DG_CODE_GENERATION $(srcdir)/makeenums.h $(CFLAGS) | \
-         awk -f $(srcdir)/makeenums.awk - arrays > $@
-
-$(srcdir)/gtktypebuiltins2.c: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
-       $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el id $< $@
-
-$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs $(srcdir)/gentypeinfo.el
-       $(SHELL) $(srcdir)/runelisp $(srcdir)/gentypeinfo.el idmac $< $@
-
-# special remake rules
-$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/makeenums.awk
-$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/makeenums.h
-$(srcdir)/gtk.defs: @MAINT@ $(srcdir)/gtk-boxed.defs
-$(srcdir)/gtktypebuiltins1.c: @MAINT@ $(srcdir)/gtk.defs
-$(srcdir)/gtktypebuiltins1.c: @MAINT@ $(srcdir)/makeenums.awk
-$(srcdir)/gtktypebuiltins1.c: @MAINT@ $(srcdir)/makeenums.h
-$(srcdir)/gtktypebuiltins2.c: @MAINT@ $(srcdir)/gtk.defs
-$(srcdir)/gtktypebuiltins2.c: @MAINT@ $(srcdir)/gentypeinfo.el
-$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gtk.defs
-$(srcdir)/gtktypebuiltins.h: @MAINT@ $(srcdir)/gentypeinfo.el
-
-libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+# We create a dummy theme for the default GTK+ theme
+
+install-data-local:
+       $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk
+       echo "# Empty gtkrc for default theme" > \
+           $(DESTDIR)$(datadir)/themes/Default/gtk/gtkrc
+
+uninstall-local:
+       rm -f $(DESTDIR)$(datadir)/themes/Default/gtkrc
 
 EXTRA_DIST = \
        line-arrow.xbm          \
        line-wrap.xbm           \
+       testgtk.1               \
        testgtkrc               \
        testgtkrc2              \
        gtkfeatures.h.in        \
+       makeenums.pl            \
        makeenums.awk           \
+       maketypes.awk           \
        makeenums.h             \
-       runelisp                \
-       gentypeinfo.el          \
-       gtktypebuiltins1.c      \
-       gtktypebuiltins2.c      \
+       gtkargcollector.c       \
+       gtktypebuiltins_vars.c  \
+       gtktypebuiltins_ids.c   \
+       gtktypebuiltins_evals.c \
        gtk-boxed.defs          \
        gtk.defs                \
+       genmarshal.pl           \
+       gtkmarshal.list         \
+       check-y.xpm             \
+       check-n.xpm             \
        test.xpm                \
        marble.xpm              \
        3DRings.xpm             \
@@ -260,39 +357,56 @@ EXTRA_DIST = \
        tree_minus.xpm          \
        tree_plus.xbm           \
        tree_minus.xbm          \
-        circles.xbm
+        circles.xbm            \
+       gtkrc.ja                \
+       gtkrc.ko                \
+       gtkrc.ru
 
-INCLUDES = -I$(top_srcdir) -I../glib -I$(top_srcdir)/glib @x_cflags@
+INCLUDES = \
+       -DGTK_DISABLE_COMPAT_H                          \
+       -DG_LOG_DOMAIN=\"Gtk\"                          \
+       -DGTK_EXE_PREFIX=\"$(exec_prefix)\"             \
+       -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
+       -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
+       -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
+       -I$(top_srcdir)                                 \
+       @GTK_DEBUG_FLAGS@                               \
+       @GTK_XIM_FLAGS@                                 \
+       @GTK_LOCALE_FLAGS@                              \
+       @GLIB_CFLAGS@                                   \
+       @x_cflags@
 
-noinst_PROGRAMS = testgtk testinput testselection testthreads simple 
-
-# FIXME, we currently rely on linking against libglib-1.1
+noinst_PROGRAMS = testgtk testinput testselection testrgb testdnd simple 
+# testthreads
 
 DEPS = \
-       libgtk-@LT_RELEASE@.la                          \
-       $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la      \
-       $(top_builddir)/glib/libglib-1.1.la
+       libgtk.la                                       \
+       $(top_builddir)/gdk/libgdk.la
+
 LDADDS = \
-       libgtk-@LT_RELEASE@.la                          \
-       $(top_builddir)/gdk/libgdk-@LT_RELEASE@.la      \
+       libgtk.la                                       \
+       $(top_builddir)/gdk/libgdk.la                   \
        @x_ldflags@                                     \
        @x_libs@                                        \
-       $(top_builddir)/glib/libglib-1.1.la             \
+       @GLIB_LIBS@                                     \
        -lm
 
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
-testthreads_DEPENDENCIES = $(DEPS)
+#testthreads_DEPENDENCIES = $(DEPS)
 testselection_DEPENDENCIES = $(DEPS)
+testrgb_DEPENDENCIES = $(DEPS)
+testdnd_DEPENDENCIES = $(DEPS)
 simple_DEPENDENCIES = $(DEPS)
 
 testgtk_LDADD = $(LDADDS)
 testinput_LDADD = $(LDADDS)
-testthreads_LDADD = $(LDADDS)
+#testthreads_LDADD = $(LDADDS)
 testselection_LDADD = $(LDADDS)
+testrgb_LDADD = $(LDADDS)
+testdnd_LDADD = $(LDADDS)
 simple_LDADD = $(LDADDS)
 
-
 .PHONY: files test test-debug
 
 files:
@@ -310,5 +424,3 @@ test-debug: testgtk
        cd $$builddir; cd $(srcdir); \
        $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
 
-gtkmarshal.c gtkmarshal.h: gtkmarshal.list
-       perl $(srcdir)/genmarshal.pl