[PATCH] do not build pk-marshal in src/

[Stepan Kasal]

... as it is already available through libpackagekit.la
---
 libpackagekit/pk-marshal.list |   35 ++++++++++++++++++++++++++++++++++-
 src/Makefile.am               |   23 +----------------------
 src/pk-marshal.list           |   34 ----------------------------------
 3 files changed, 35 insertions(+), 57 deletions(-)
 mode change 120000 => 100644 libpackagekit/pk-marshal.list
 delete mode 100644 src/pk-marshal.list

diff --git a/libpackagekit/pk-marshal.list b/libpackagekit/pk-marshal.list
deleted file mode 120000
index d924fc0..5532e9c
--- a/libpackagekit/pk-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-../src/pk-marshal.list
\ No newline at end of file
diff --git a/libpackagekit/pk-marshal.list b/libpackagekit/pk-marshal.list
new file mode 100644
index d924fc0..5532e9c
--- /dev/null
+++ b/libpackagekit/pk-marshal.list
@@ -0,0 +1,34 @@
+VOID:UINT,STRING,STRING
+VOID:UINT,STRING
+VOID:UINT,STRING,UINT
+VOID:UINT,UINT
+VOID:UINT,UINT,UINT,UINT
+VOID:STRING,UINT,UINT,UINT,UINT
+VOID:STRING
+VOID:STRING,BOOL
+VOID:STRING,UINT
+VOID:STRING,STRING,UINT
+VOID:STRING,UINT,STRING,STRING
+VOID:STRING,STRING
+VOID:STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,UINT
+VOID:STRING,STRING,UINT,STRING,STRING,UINT64
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT64
+VOID:STRING,STRING,STRING,STRING,STRING,UINT64
+VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT
+VOID:STRING,STRING,BOOL
+VOID:STRING,STRING,STRING,BOOL
+VOID:STRING,UINT,STRING,STRING
+VOID:STRING,STRING,UINT,UINT,UINT
+VOID:STRING,STRING,BOOL,UINT,UINT,STRING
+VOID:STRING,STRING,STRING,BOOL,STRING,UINT,STRING
+VOID:STRING,STRING,BOOL,STRING,UINT,STRING
+
diff --git a/src/Makefile.am b/src/Makefile.am
index b370d48..21f3cb0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,8 +39,6 @@ pkbackendinclude_HEADERS =				\
 	$(NULL)
 
 shared_SOURCES =					\
-	pk-marshal.c					\
-	pk-marshal.h					\
 	pk-runner.c					\
 	pk-runner.h					\
 	pk-backend.c					\
@@ -107,18 +105,7 @@ packagekitd_LDADD += 					\
 	$(BOX_LIBS)
 endif
 
-BUILT_SOURCES = 					\
-	pk-marshal.c					\
-	pk-marshal.h					\
-	pk-interface.h					\
-	$(NULL)
-
-pk-marshal.c: pk-marshal.list
-	echo "#include \"pk-marshal.h\"" > $@ && \
-	glib-genmarshal $< --prefix=pk_marshal --body >> $@
-
-pk-marshal.h: pk-marshal.list
-	glib-genmarshal $< --prefix=pk_marshal --header > $@
+BUILT_SOURCES = pk-interface.h
 
 pk-interface.h: pk-interface.xml
 	$(LIBTOOL) --mode=execute dbus-binding-tool	\
@@ -168,20 +155,12 @@ gprof: clean-gprof all check
 	gprof .libs/pk-self-test > gprof.txt
 endif
 
-EXTRA_DIST =						\
-	pk-marshal.list					\
-	pk-security-polkit.c				\
-	pk-security-dummy.c				\
-	pk-interface.xml				\
-	$(NULL)
-
 clean-local:
 	rm -f *~
 	rm -f *.out
 	rm -f *.gcno
 	rm -f gcov.txt
 	rm -f gprof.txt
-	rm -f pk-marshal.c pk-marshal.h
 
 CLEANFILES = *~ $(BUILT_SOURCES)
 
diff --git a/src/pk-marshal.list b/src/pk-marshal.list
deleted file mode 100644
index 5532e9c..0000000
--- a/src/pk-marshal.list
+++ /dev/null
@@ -1,34 +0,0 @@
-VOID:UINT,STRING,STRING
-VOID:UINT,STRING
-VOID:UINT,STRING,UINT
-VOID:UINT,UINT
-VOID:UINT,UINT,UINT,UINT
-VOID:STRING,UINT,UINT,UINT,UINT
-VOID:STRING
-VOID:STRING,BOOL
-VOID:STRING,UINT
-VOID:STRING,STRING,UINT
-VOID:STRING,UINT,STRING,STRING
-VOID:STRING,STRING
-VOID:STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,STRING,UINT
-VOID:STRING,STRING,UINT,STRING,STRING,UINT64
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT64
-VOID:STRING,STRING,STRING,STRING,STRING,UINT64
-VOID:STRING,STRING,STRING,STRING,STRING,STRING,UINT
-VOID:STRING,STRING,BOOL
-VOID:STRING,STRING,STRING,BOOL
-VOID:STRING,UINT,STRING,STRING
-VOID:STRING,STRING,UINT,UINT,UINT
-VOID:STRING,STRING,BOOL,UINT,UINT,STRING
-VOID:STRING,STRING,STRING,BOOL,STRING,UINT,STRING
-VOID:STRING,STRING,BOOL,STRING,UINT,STRING
-
-- 
1.5.4.1


--ibTvN161/egqYuK8
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="0003-clean-up-the-rules-for-compiling-marshal.list.patch"