]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
Incremented version to 1.2.0. -Shawn <amundson@gtk.org>
[~andy/gtk] / gtk / Makefile.am
index ef743f9f14879d2132b772298f7662a4981007c4..d55b7bd71fb0c81d72f50cbb1204bbcbec09de84 100644 (file)
@@ -4,7 +4,7 @@ gtkincludedir = $(includedir)/gtk
 
 lib_LTLIBRARIES = libgtk.la
 
-static_sources = \
+static_SOURCES = \
        gtkaccelgroup.c         \
        gtkaccellabel.c         \
        gtkadjustment.c         \
@@ -30,7 +30,6 @@ static_sources = \
        gtkdialog.c             \
        gtkdnd.c                \
        gtkdrawingarea.c        \
-       gtkdrawwindow.c         \
        gtkeditable.c           \
        gtkentry.c              \
        gtkeventbox.c           \
@@ -50,6 +49,7 @@ static_sources = \
        gtkhseparator.c         \
        gtkimage.c              \
        gtkinputdialog.c        \
+       gtkintl.h               \
        gtkinvisible.c          \
        gtkitem.c               \
        gtkitemfactory.c        \
@@ -114,7 +114,7 @@ static_sources = \
        fnmatch.h
 
 libgtk_la_SOURCES = \
-       $(static_sources)       \
+       $(static_SOURCES)       \
        gtkmarshal.c
 
 # Source headers which are non-autogenerated headers
@@ -147,7 +147,6 @@ source_headers = \
        gtkdialog.h             \
        gtkdnd.h                \
        gtkdrawingarea.h        \
-       gtkdrawwindow.h         \
        gtkeditable.h           \
        gtkentry.h              \
        gtkenums.h              \
@@ -236,14 +235,12 @@ gtkinclude_HEADERS =              \
        gtkmarshal.h            \
        gtktypebuiltins.h
 
-# note gtk.defs and gtkmarshal.[ch] aren't here, but their stamps are
+# 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 = \
-       stamp-d                         \
-       stamp-m                         \
-       gtktypebuiltins.h               \
-       gtktypebuiltins_evals.c         \
-       gtktypebuiltins_ids.c           \
-        gtktypebuiltins_vars.c
+       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)
@@ -254,51 +251,72 @@ gdk_headers = \
        ../gdk/gdkrgb.h
 
 # generate gtk.defs file from gtk-boxed.defs and *.h
-gtk.defs: @REBUILD@ stamp-d
+gtk.defs: @REBUILD@ s-gd
        @:
-stamp-d: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+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 || mv s-gd gtk.defs) && rm -f s-gd \
-       && echo timestamp > stamp-d
+       && (cmp -s s-gd gtk.defs || cp s-gd gtk.defs)
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
+gtktypebuiltins.h: @REBUILD@ s-gtb
+       @:
+s-gtb: @REBUILD@ s-gd maketypes.awk
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs macros > s-gtb \
-       && mv s-gtb gtktypebuiltins.h
+       && (cmp -s s-gtb gtktypebuiltins.h || cp s-gtb gtktypebuiltins.h)
 
 # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
+gtktypebuiltins_vars.c: @REBUILD@ s-gtbv
+       @:
+s-gtbv: @REBUILD@ s-gd maketypes.awk
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs variables > s-gtbv \
-       && mv s-gtbv gtktypebuiltins_vars.c
+       && (cmp -s s-gtbv gtktypebuiltins_vars.c || cp s-gtbv gtktypebuiltins_vars.c)
 
 # generate type entries for type-id registration
-gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
+gtktypebuiltins_ids.c: @REBUILD@ s-gtbi
+       @:
+s-gtbi: @REBUILD@ s-gd maketypes.awk
        cd $(srcdir) \
        && $(AWK) -f maketypes.awk gtk.defs entries > s-gtbi \
-       && mv s-gtbi gtktypebuiltins_ids.c 
+       && (cmp -s s-gtbi gtktypebuiltins_ids.c || cp s-gtbi gtktypebuiltins_ids.c)
 
 # generate enum value arrays
-gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
+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 \
-       && mv s-gtbe gtktypebuiltins_evals.c
+       && (cmp -s s-gtbe gtktypebuiltins_evals.c || cp s-gtbe gtktypebuiltins_evals.c)
 
-gtkmarshal.c gtkmarshal.h: @REBUILD@ stamp-m
+$(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m
        @:
-stamp-m: @REBUILD@ gtkmarshal.list 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 \
+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)
+       -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:
+       :
+       
 # We create a dummy theme for the default GTK+ theme
 
 install-data-local:
@@ -328,6 +346,8 @@ EXTRA_DIST = \
        gtk.defs                \
        genmarshal.pl           \
        gtkmarshal.list         \
+       check-y.xpm             \
+       check-n.xpm             \
        test.xpm                \
        marble.xpm              \
        3DRings.xpm             \
@@ -337,20 +357,23 @@ EXTRA_DIST = \
        tree_minus.xpm          \
        tree_plus.xbm           \
        tree_minus.xbm          \
-        circles.xbm
+        circles.xbm            \
+       gtkrc.ja                \
+       gtkrc.ko                \
+       gtkrc.ru
 
 INCLUDES = \
-       -DG_LOG_DOMAIN=\"Gtk\"                  \
-       -DGTK_EXE_PREFIX=\"$(exec_prefix)\"     \
-       -DGTK_DATA_PREFIX=\"$(prefix)\"         \
-       -DGTK_SYSCONFDIR=\"$(sysconfdir)\"      \
-       -DGTK_LOCALEDIR=\"$(datadir)/locale\"   \
-       -I$(top_srcdir)                         \
-       @GTK_DEBUG_FLAGS@                       \
-       @GTK_XIM_FLAGS@                         \
-       @GTK_LOCALE_FLAGS@                      \
-       @GTK_THREAD_FLAGS@                      \
-       @GLIB_CFLAGS@                           \
+       -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 testrgb testdnd simple 
@@ -400,3 +423,4 @@ test-debug: testgtk
        builddir=`pwd`; cd $(top_builddir); top_builddir=`pwd`; \
        cd $$builddir; cd $(srcdir); \
        $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
+