diff options
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 7ce7310c55..d2802d55ec 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -5,7 +5,7 @@ DEFS += -DG_LOG_DOMAIN=\"Gtk\" lib_LTLIBRARIES = libgtk.la -libgtk_la_SOURCES = \ +static_sources = \ gtkaccelgroup.c \ gtkaccellabel.c \ gtkadjustment.c \ @@ -31,6 +31,7 @@ libgtk_la_SOURCES = \ gtkdialog.c \ gtkdnd.c \ gtkdrawingarea.c \ + gtkdrawwindow.c \ gtkeditable.c \ gtkentry.c \ gtkeventbox.c \ @@ -57,7 +58,6 @@ libgtk_la_SOURCES = \ gtklist.c \ gtklistitem.c \ gtkmain.c \ - gtkmarshal.c \ gtkmenu.c \ gtkmenubar.c \ gtkmenufactory.c \ @@ -90,6 +90,7 @@ libgtk_la_SOURCES = \ gtktable.c \ gtktearoffmenuitem.c \ gtktext.c \ + gtkthemes.c \ gtktipsquery.c \ gtktogglebutton.c \ gtktoolbar.c \ @@ -110,6 +111,10 @@ libgtk_la_SOURCES = \ fnmatch.c \ fnmatch.h +libgtk_la_SOURCES = \ + $(static_sources) \ + gtkmarshal.c + # Source headers are are non-autogenerated headers source_headers = \ gtk.h \ @@ -139,6 +144,7 @@ source_headers = \ gtkdialog.h \ gtkdnd.h \ gtkdrawingarea.h \ + gtkdrawwindow.h \ gtkeditable.h \ gtkentry.h \ gtkenums.h \ @@ -199,6 +205,7 @@ source_headers = \ gtktable.h \ gtktearoffmenuitem.h \ gtktext.h \ + gtkthemes.h \ gtktipsquery.h \ gtktogglebutton.h \ gtktoolbar.h \ @@ -232,7 +239,7 @@ BUILT_SOURCES = \ gtkmarshal.h # cause the built sources to be rebuild when possible, even with --include-deps -$(libgtk_la_SOURCES): $(BUILT_SOURCES) +$(static_sources): $(BUILT_SOURCES) # More headers to use when autogenerating. gdk_headers = \ @@ -307,12 +314,13 @@ EXTRA_DIST = \ tree_minus.xbm \ circles.xbm -INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ +INCLUDES = \ + -DGTK_EXE_PREFIX=\"$(exec_prefix)\" \ + -DGTK_DATA_PREFIX=\"$(prefix)\" \ + -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb testdnd simple -# FIXME, we currently rely on linking against libglib-1.1 - DEPS = \ libgtk.la \ $(top_builddir)/gdk/libgdk.la |