summaryrefslogtreecommitdiffstats
path: root/devel/dconf/files/patch-editor_Makefile.in
diff options
context:
space:
mode:
Diffstat (limited to 'devel/dconf/files/patch-editor_Makefile.in')
-rw-r--r--devel/dconf/files/patch-editor_Makefile.in30
1 files changed, 15 insertions, 15 deletions
diff --git a/devel/dconf/files/patch-editor_Makefile.in b/devel/dconf/files/patch-editor_Makefile.in
index 8f158fc..f9935dd 100644
--- a/devel/dconf/files/patch-editor_Makefile.in
+++ b/devel/dconf/files/patch-editor_Makefile.in
@@ -1,20 +1,20 @@
---- editor/Makefile.in.orig 2012-10-03 17:32:51.000000000 +0000
-+++ editor/Makefile.in 2012-10-03 17:35:54.000000000 +0000
-@@ -55,7 +55,7 @@
- dconf-schema.$(OBJEXT) dconf-view.$(OBJEXT)
+--- editor/Makefile.orig.in 2013-03-26 19:20:12.623348896 +0000
++++ editor/Makefile.in 2013-03-26 19:21:40.077341977 +0000
+@@ -72,7 +72,7 @@
+ dconf_editor-dconf-view.$(OBJEXT)
dconf_editor_OBJECTS = $(am_dconf_editor_OBJECTS)
am__DEPENDENCIES_1 =
--dconf_editor_DEPENDENCIES = ../client/libdconf.so.0 \
+-dconf_editor_DEPENDENCIES = ../client/libdconf.so.1 \
+dconf_editor_DEPENDENCIES = -ldconf \
$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
$(am__DEPENDENCIES_1)
- DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
-@@ -232,7 +232,7 @@
- top_srcdir = @top_srcdir@
- 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
--dconf_editor_LDADD = ../client/libdconf.so.0 $(gtk_LIBS) $(gmodule_LIBS) $(gee_LIBS) $(libxml_LIBS)
-+dconf_editor_LDADD = -ldconf $(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
- desktopdir = $(datadir)/applications
- desktop_in_files = dconf-editor.desktop.in.in
+ dconf_editor_LINK = $(CCLD) $(dconf_editor_CFLAGS) $(CFLAGS) \
+@@ -297,7 +297,7 @@
+ INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/client
+ 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.1 \
++ -ldconf \
+ $(gtk_LIBS) \
+ $(gee_LIBS) \
+ $(gmodule_LIBS) \
OpenPOWER on IntegriCloud