diff options
| author | Ryan Lortie <desrt@desrt.ca> | 2012-07-08 21:47:23 -0400 |
|---|---|---|
| committer | Ryan Lortie <desrt@desrt.ca> | 2012-07-08 21:47:23 -0400 |
| commit | d56a9ce678101d6dc66e0d322d5f33e04bbc98fc (patch) | |
| tree | 8a3e37f9faa37b27c5f762775367fe03d92b1364 /editor | |
| parent | 792a13279603b2533961a48b778514c805ef39cd (diff) | |
| download | dconf-d56a9ce678101d6dc66e0d322d5f33e04bbc98fc.tar.gz | |
massive Makefile reorganisation
Clean up the Makefiles and make them as similar as possible.
Move CFLAGS to a common point of definition and stop using -I so much.
Replace the 'dbus stub' with libdconf-mock.a in tests/. Fill in some
stubs for future mock code for shm and gvdb (just to get things
compiling for now).
Diffstat (limited to 'editor')
| -rw-r--r-- | editor/Makefile.am | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/editor/Makefile.am b/editor/Makefile.am index 8928acc..1a593c3 100644 --- a/editor/Makefile.am +++ b/editor/Makefile.am @@ -1,12 +1,30 @@ include $(top_srcdir)/Makefile.gtester +INCLUDES = -I$(top_srcdir)/common -I$(top_srcdir)/client + bin_PROGRAMS = dconf-editor -AM_CFLAGS = $(gtk_CFLAGS) $(gmodule_CFLAGS) $(libxml_CFLAGS) -I$(top_srcdir)/common -I$(top_srcdir)/client -DPKGDATADIR=\"@datadir@/dconf-editor\" -AM_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf -CFLAGS += -Wno-error -Wno-unused-but-set-variable -Wno-unused-variable -dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS) -dconf_editor_SOURCES = config.vapi dconf-editor.vala dconf-model.vala dconf-schema.vala dconf-view.vala +dconf_editor_VALAFLAGS = --vapidir ../client --pkg gtk+-3.0 --pkg gmodule-2.0 --pkg libxml-2.0 --pkg dconf + +dconf_editor_LDADD = \ + ../client/libdconf.so.0 \ + $(gtk_LIBS) \ + $(gee_LIBS) \ + $(gmodule_LIBS) \ + $(libxml_LIBS) + +dconf_editor_CFLAGS = \ + $(gtk_CFLAGS) \ + $(gee_CFLAGS) \ + $(libxml_CFLAGS) \ + -DPKGDATADIR=\"$(pkgdatadir)\" + +dconf_editor_SOURCES = \ + config.vapi \ + dconf-editor.vala \ + dconf-model.vala \ + dconf-schema.vala \ + dconf-view.vala desktopdir = $(datadir)/applications desktop_in_files = dconf-editor.desktop.in.in @@ -30,7 +48,7 @@ update-icon-cache: gtk-update-icon-cache -f -t $(datadir)/icons/hicolor; \ fi -uidir = $(datadir)/dconf-editor -dist_ui_DATA = dconf-editor.ui +pkgdatadir = $(datadir)/dconf-editor +dist_pkgdata_DATA = dconf-editor.ui EXTRA_DIST = $(gsettings_SCHEMAS) $(icons) |