]> Pileus Git - ~andy/gtk/blobdiff - gtk/Makefile.am
moved GtkAnchorType and GtkSideType from gtkpacker.h to gtkenum.h.
[~andy/gtk] / gtk / Makefile.am
index b8d296f9976d4059b125d126cdf82c2b418f47af..1822458844e69855148cb4b3c47f6aa1d60d3007 100644 (file)
@@ -5,19 +5,19 @@ SUBDIRS=stock-icons
 INCLUDES = @STRIP_BEGIN@ \
        -DG_LOG_DOMAIN=\"Gtk\"                          \
        -DGTK_DISABLE_COMPAT_H                          \
-       -DGTK_EXE_PREFIX=\"$(exec_prefix)\"             \
+       -DGTK_LIBDIR=\"$(libdir)\"                      \
        -DGTK_DATA_PREFIX=\"$(prefix)\"                 \
        -DGTK_SYSCONFDIR=\"$(sysconfdir)\"              \
        -DGTK_LOCALEDIR=\"$(gtklocaledir)\"             \
        -DGTK_VERSION=\"@GTK_VERSION@\"                 \
        -DTESTGTK_RCFILE=\"`pwd`/$(srcdir)/testgtkrc\"  \
+       -DG_DISABLE_CONST_RETURNS                       \
        -I$(top_builddir)/gtk                           \
        -I$(top_srcdir) -I../gdk                        \
        -I$(top_srcdir)/gdk                             \
        -I$(top_srcdir)/gdk-pixbuf -I../gdk-pixbuf      \
        @GTK_DEBUG_FLAGS@                               \
        @GTK_XIM_FLAGS@                                 \
-       @GTK_LOCALE_FLAGS@                              \
        @PANGO_CFLAGS@                                  \
        @GLIB_CFLAGS@                                   \
        @more_cflags@                                   \
@@ -41,7 +41,6 @@ LDFLAGS = @STRIP_BEGIN@ \
        -lm                                                     \
 @STRIP_END@
 
-
 #
 # setup source file variables
 #
@@ -65,12 +64,12 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkcalendar.h           \
        gtkcheckbutton.h        \
        gtkcheckmenuitem.h      \
+       gtkseparatormenuitem.h  \
        gtkclist.h              \
        gtkclipboard.h          \
        gtkcolorsel.h           \
        gtkcolorseldialog.h     \
        gtkcombo.h              \
-       gtkcompat.h             \
        gtkcontainer.h          \
        gtkctree.h              \
        gtkcurve.h              \
@@ -79,7 +78,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkcellrenderertextpixbuf.h     \
        gtkcellrenderertoggle.h \
        gtkcellrendererpixbuf.h \
-       gtkdata.h               \
        gtkdebug.h              \
        gtkdialog.h             \
        gtkdnd.h                \
@@ -105,6 +103,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkhsv.h                \
        gtkiconfactory.h        \
        gtkimage.h              \
+       gtkimagemenuitem.h      \
        gtkimcontext.h          \
        gtkimmodule.h           \
        gtkimmulticontext.h     \
@@ -120,7 +119,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkmain.h               \
        gtkmenu.h               \
        gtkmenubar.h            \
-       gtkmenufactory.h        \
        gtkmenuitem.h           \
        gtkmenushell.h          \
        gtkmessagedialog.h      \
@@ -131,7 +129,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkoptionmenu.h         \
        gtkpacker.h             \
        gtkpaned.h              \
-       gdk-pixbuf-loader.h     \
        gtkpixmap.h             \
        gtkplug.h               \
        gtkpreview.h            \
@@ -148,6 +145,7 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtkscrolledwindow.h     \
        gtkselection.h          \
        gtkseparator.h          \
+       gtksettings.h           \
        gtksignal.h             \
        gtksocket.h             \
        gtkspinbutton.h         \
@@ -171,11 +169,12 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
        gtktoolbar.h            \
        gtktooltips.h           \
        gtktree.h               \
+       gtktreednd.h            \
        gtktreeitem.h           \
        gtktreemodel.h          \
-       gtktreemodelsimple.h    \
        gtktreemodelsort.h      \
        gtktreeselection.h      \
+       gtktreesortable.h       \
        gtktreestore.h          \
        gtktreeview.h           \
        gtktreeviewcolumn.h     \
@@ -228,6 +227,7 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkcellrendererpixbuf.c \
        gtkcheckbutton.c        \
        gtkcheckmenuitem.c      \
+       gtkseparatormenuitem.c  \
        gtkclipboard.c          \
        gtkclist.c              \
        gtkcolorsel.c           \
@@ -236,7 +236,6 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkcontainer.c          \
        gtkctree.c              \
        gtkcurve.c              \
-       gtkdata.c               \
        gtkdialog.c             \
        gtkdnd.c                \
        gtkdrawingarea.c        \
@@ -260,6 +259,7 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkhsv.c                \
        gtkiconfactory.c        \
        gtkimage.c              \
+       gtkimagemenuitem.c      \
        gtkimcontext.c          \
        gtkimcontextsimple.c    \
        gtkimcontextsimple.h    \
@@ -278,7 +278,6 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkmain.c               \
        gtkmenu.c               \
        gtkmenubar.c            \
-       gtkmenufactory.c        \
        gtkmenuitem.c           \
        gtkmenushell.c          \
        gtkmessagedialog.c      \
@@ -290,7 +289,6 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkpacker.c             \
        gtkpaned.c              \
        gtkpixmap.c             \
-       gtkplug.c               \
        gtkpreview.c            \
        gtkprogress.c           \
        gtkprogressbar.c        \
@@ -305,8 +303,8 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkscrolledwindow.c     \
        gtkselection.c          \
        gtkseparator.c          \
+       gtksettings.c           \
        gtksignal.c             \
-       gtksocket.c             \
        gtkspinbutton.c         \
        gtkstock.c              \
        gtkstyle.c              \
@@ -336,10 +334,11 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtktree.c               \
        gtktreeitem.c           \
        gtktreedatalist.c       \
+       gtktreednd.c            \
        gtktreemodel.c          \
-       gtktreemodelsimple.c    \
        gtktreemodelsort.c      \
        gtktreeselection.c      \
+       gtktreesortable.c       \
        gtktreestore.c          \
        gtktreeview.c           \
        gtktreeviewcolumn.c     \
@@ -357,30 +356,15 @@ gtk_c_sources = @STRIP_BEGIN@   \
        gtkwindow-decorate.c    \
        fnmatch.c               \
        fnmatch.h               \
-       gdk-pixbuf-loader.c     \
+       xembed.h                \
 @STRIP_END@
-# Extra headers that are used for enum type array/id generation
-gdk_headers = @STRIP_BEGIN@    \
-       ../gdk/gdkcc.h          \
-       ../gdk/gdkcolor.h       \
-       ../gdk/gdkcursor.h      \
-       ../gdk/gdkdnd.h         \
-       ../gdk/gdkdrawable.h    \
-       ../gdk/gdkevents.h      \
-       ../gdk/gdkfont.h        \
-       ../gdk/gdkgc.h          \
-       ../gdk/gdkim.h          \
-       ../gdk/gdkimage.h       \
-       ../gdk/gdkinput.h       \
-       ../gdk/gdkpixmap.h      \
-       ../gdk/gdkproperty.h    \
-       ../gdk/gdkregion.h      \
-       ../gdk/gdkrgb.h         \
-       ../gdk/gdkselection.h   \
-       ../gdk/gdktypes.h       \
-       ../gdk/gdkvisual.h      \
-       ../gdk/gdkwindow.h      \
+
+if USE_X11
+gtk_plug_c_sources = @STRIP_BEGIN@   \
+       gtkplug.c               \
+       gtksocket.c             \
 @STRIP_END@
+endif
 
 # we use our own built_sources variable rules to avoid automake's
 # BUILT_SOURCES oddities
@@ -410,8 +394,6 @@ gtk_built_sources = @STRIP_BEGIN@ \
 # their own .lo rules and don't get publically installed
 gtk_extra_sources = @STRIP_BEGIN@ \
        gtkcompat.h.in          \
-       makeenums.pl            \
-       makeenums.awk           \
        maketypes.awk           \
        makeenums.h             \
        gtkargcollector.c       \
@@ -423,8 +405,8 @@ gtk_extra_sources = @STRIP_BEGIN@ \
 #
 # setup GTK+ sources and their dependancies
 #
-gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources)
-gtk_target_sources = $(gtk_c_sources)
+gtk_target_headers = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkcompat.h
+gtk_target_sources = $(gtk_c_sources) $(gtk_plug_c_sources)
 MAINTAINERCLEANFILES += $(gtk_built_sources)
 EXTRA_HEADERS +=
 EXTRA_DIST += $(gtk_private_h_sources) $(gtk_extra_sources)
@@ -448,9 +430,14 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h:          # never add deps here
 # versions in the build dir. thus a development setup requires
 # srcdir to be writable, passing --disable-rebuilds to
 # ../configure will supress all autogeneration rules.
-$(srcdir)/stamp-gtk.defs: @REBUILD@ makeenums.pl gtk.defs gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
+$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
        cd $(srcdir) \
-       && $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) > xgen-gdef \
+       && glib-mkenums --comments ";; @comment@" \
+                       --fprod "; enumerations from \"@filename@\"\n " \
+                       --vhead "(define-@type@ @EnumName@" \
+                       --vprod "   (@valuenick@ @VALUENAME@)" \
+                       --vtail ")" \
+                       $(gtk_public_h_sources) > xgen-gdef \
        && cat gtk-boxed.defs >> xgen-gdef \
        && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \
        && rm -f xgen-gdef \
@@ -482,9 +469,14 @@ $(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs
        && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \
        && cp xgen-gtbic $(@F) \
        && rm -f xgen-gtbic
-$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers)
+$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
        cd $(srcdir) \
-       && $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec \
+       && glib-mkenums \
+                       --fprod "\n/* enumerations from \"@filename@\" */" \
+                       --vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
+                       --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
+                       --vtail "  { 0, NULL, NULL }\n};" \
+                       $(gtk_public_h_sources) > xgen-gtbec \
        && cp xgen-gtbec $(@F) \
        && rm -f xgen-gtbec
 
@@ -515,9 +507,6 @@ EXTRA_LTLIBRARIES = libgtk-x11-1.3.la libgtk-nanox-1.3.la libgtk-linux-fb-1.3.la
 install-data-local:
        $(mkinstalldirs) $(DESTDIR)$(datadir)/themes/Default/gtk-2.0
        echo "# Empty gtkrc for default theme" > $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
-       $(mkinstalldirs) $(DESTDIR)$(sysconfdir)/gtk-2.0
-       $(top_builddir)/gtk/gtk-query-immodules-2.0 > $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
-uninstall-local:
        rm -f $(DESTDIR)$(datadir)/themes/Default/gtk-2.0/gtkrc
 
 DEPS = @gtktargetlib@ $(top_builddir)/gdk-pixbuf/libgdk_pixbuf-1.3.la $(top_builddir)/gdk/@gdktargetlib@
@@ -546,38 +535,6 @@ gtk_query_immodules_2_0_LDADD = $(LDADDS)
 
 gtk_query_immodules_2_0_SOURCES = queryimmodules.c
 
-gtk.immodules: gtk-query-immodules-2.0 ../modules/input/Makefile.am
-       ./gtk-query-immodules-2.0 ../modules/input/.libs/*.so > gtk.immodules
-
-#
-# test programs, not to be installed
-#
-noinst_PROGRAMS = testgtk testcalendar testinput testselection testrgb testdnd testtext simple treestoretest testtextbuffer # testthreads
-
-testcalendar_DEPENDENCIES = $(TEST_DEPS)
-testgtk_DEPENDENCIES = $(TEST_DEPS)
-testinput_DEPENDENCIES = $(TEST_DEPS)
-testrgb_DEPENDENCIES = $(TEST_DEPS)
-testselection_DEPENDENCIES = $(TEST_DEPS)
-testtext_DEPENDENCIES = $(TEST_DEPS)
-testtextbuffer_DEPENDENCIES = $(TEST_DEPS)
-treestoretest_DEPENDENCIES = $(TEST_DEPS)
-testdnd_DEPENDENCIES = $(TEST_DEPS)
-simple_DEPENDENCIES = $(TEST_DEPS)
-#testthreads_DEPENDENCIES = $(TEST_DEPS)
-
-testcalendar_LDADD = $(LDADDS)
-testgtk_LDADD = $(LDADDS)
-testinput_LDADD = $(LDADDS)
-testrgb_LDADD = $(LDADDS)
-testselection_LDADD = $(LDADDS)
-testtext_LDADD = $(LDADDS)
-testtextbuffer_LDADD = $(LDADDS)
-treestoretest_LDADD = $(LDADDS)
-testdnd_LDADD = $(LDADDS)
-simple_LDADD = $(LDADDS)
-#testthreads_LDADD = $(LDADDS)
-
 .PHONY: files test test-debug
 
 files:
@@ -585,38 +542,14 @@ files:
          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
-
 EXTRA_DIST += @STRIP_BEGIN@    \
        oldest-source-stamp     \
-       testgtk.1               \
-       testgtkrc               \
-       testgtkrc2              \
-       circles.xbm             \
        line-arrow.xbm          \
        line-wrap.xbm           \
        tree_plus.xbm           \
        tree_minus.xbm          \
-       3DRings.xpm             \
-       FilesQueue.xpm          \
-       Modeller.xpm            \
-       check-y.xpm             \
-       check-n.xpm             \
-       marble.xpm              \
        tree_minus.xpm          \
        tree_plus.xpm           \
-       test.xpm                \
-       check-y.xpm             \
-       check-n.xpm             \
-       test.xpm                \
        gtk.def                 \
        gtk-win32.rc            \
        gtk-win32.rc.in         \