build: fix for ubuntu

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Keruspe · Oct 30, 2012 · 6d9470b · 6d9470b
1 parent ab88c99
commit 6d9470b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 13 deletions.
diff --git a/bindings/gi.mk b/bindings/gi.mk
@@ -17,38 +17,39 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 
-INTROSPECTION_SCANNER_ARGS = --c-include=gpaste.h --c-include=gpaste-daemon.h --c-include=gpaste-client.h
+INTROSPECTION_SCANNER_ARGS = --c-include=gpaste.h --c-include=gpaste-client.h --c-include=gpaste-daemon.h
 INTROSPECTION_COMPILER_ARGS = $(NULL)
 
 libgpaste_gir_file = bindings/gi/GPaste-1.0.gir
 
-$(libgpaste_gir_file): $(libgpaste_core_la_file) $(libgpaste_daemon_la_file) $(libgpaste_client_la_file)
+$(libgpaste_gir_file): $(libgpaste_client_la_file) $(libgpaste_core_la_file) $(libgpaste_daemon_la_file)
 bindings_gi_GPaste_1_0_gir_FILES = \
-	$(libgpaste_settings_libgpaste_settings_la_SOURCES) \
-	$(libgpaste_keybinder_libgpaste_keybinder_la_SOURCES) \
+	$(libgpaste_client_libgpaste_client_la_SOURCES) \
 	$(libgpaste_core_libgpaste_core_la_SOURCES) \
 	$(libgpaste_daemon_libgpaste_daemon_la_SOURCES) \
-	$(libgpaste_client_libgpaste_client_la_SOURCES) \
+	$(libgpaste_keybinder_libgpaste_keybinder_la_SOURCES) \
+	$(libgpaste_settings_libgpaste_settings_la_SOURCES) \
 	$(NULL)
 bindings_gi_GPaste_1_0_gir_CFLAGS = $(INCLUDES) -DG_PASTE_COMPILATION \
-	-I$(srcdir)/libgpaste/settings \
-	-I$(srcdir)/libgpaste/keybinder \
+	-I$(srcdir)/libgpaste/client \
 	-I$(srcdir)/libgpaste/core \
 	-I$(srcdir)/libgpaste/daemon \
-	-I$(srcdir)/libgpaste/client \
+	-I$(srcdir)/libgpaste/keybinder \
+	-I$(srcdir)/libgpaste/settings \
 	$(NULL)
 bindings_gi_GPaste_1_0_gir_LIBS = \
-	$(libgpaste_keybinder_la_file) \
+	$(libgpaste_client_la_file) \
 	$(libgpaste_core_la_file) \
 	$(libgpaste_daemon_la_file) \
-	$(libgpaste_client_la_file) \
+	$(libgpaste_keybinder_la_file) \
+	$(libgpaste_settings_la_file) \
 	$(NULL)
 bindings_gi_GPaste_1_0_gir_EXPORT_PACKAGES = \
-	libgpaste-settings \
-	libgpaste-keybinder \
+	libgpaste-client \
 	libgpaste-core \
 	libgpaste-daemon \
-	libgpaste-client \
+	libgpaste-keybinder \
+	libgpaste-settings \
 	$(NULL)
 bindings_gi_GPaste_1_0_gir_SCANNERFLAGS = --warn-all --warn-error
 bindings_gi_GPaste_1_0_gir_INCLUDES = \

diff --git a/src/gpasted.mk b/src/gpasted.mk
@@ -35,5 +35,8 @@ bin_gpasted_CFLAGS = \
 
 bin_gpasted_LDADD = \
 	$(libgpaste_common_la_file) \
+	$(libgpaste_core_la_file) \
 	$(libgpaste_daemon_la_file) \
+	$(libgpaste_keybinder_la_file) \
+	$(libgpaste_settings_la_file) \
 	$(NULL)