ReleaseHEADmaster

11 files changed, 76 insertions, 15 deletions

diff --git a/sfshare-daemon/Makefile.am b/sfshare-daemon/Makefile.am
index 834fbb9..6998c17 100755
--- a/sfshare-daemon/Makefile.am
+++ b/sfshare-daemon/Makefile.am
@@ -1,5 +1,36 @@
-AUTOMAKE_OPTIONS = foreign 
+NULL =
 
-SUBDIRS = \
-	src	\
-	data
+SUBDIRS = data
+
+INCLUDES =						\
+	-DDATADIR=\"$(datadir)\"			\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" 	\
+	-I$(top_srcdir)					\
+	-I$(top_builddir)				\
+	$(WARN_CFLAGS)					\
+	$(DISABLE_DEPRECATED_CFLAGS)			\
+	$(GLIB_CFLAGS)					\
+	$(GTK_CFLAGS)					\
+	$(DBUS_GLIB_CFLAGS)				\
+	$(POLKIT_CFLAGS)				\
+	$(NULL)
+
+LDADD = 			\
+	$(GLIB_LIBS)		\
+	$(GTK_LIBS)		\
+	$(DBUS_GLIB_LIBS)	\
+	$(POLKIT_LIBS)		\
+	$(NULL)
+
+
+libexec_PROGRAMS = sfshared
+
+sfshared_SOURCES =		\
+	dbus_service.h		\
+	dbus_service.c		\
+	dbus_service_glue.h	\
+	samba_share.h		\
+	samba_share.c		\
+	sfshare_errors.h	\
+	sfshared.c		\
+	$(NULL)
diff --git a/sfshare-daemon/data/Makefile.am b/sfshare-daemon/data/Makefile.am
index 0e32e00..67fbe11 100755
--- a/sfshare-daemon/data/Makefile.am
+++ b/sfshare-daemon/data/Makefile.am
@@ -1,7 +1,26 @@
-#/etc/dbus-1/system.d
-dbusconfdir   = $(sysconfdir)/dbus-1/system.d/
+
+dbusxmldir   = $(datadir)/dbus-1/interfaces
+dbusxml_DATA =  org.fedoraproject.SimpleFileShare.xml
+
+dbusconfdir   = /etc/dbus-1/system.d/
+#/etc/dbus-1/system.d/
+#$(sysconfdir)/dbus-1/system.d/
 dbusconf_DATA = org.fedoraproject.SimpleFileShare.conf
 
+polkitactionsdir   = /usr/share/polkit-1/actions/
+# /usr/share/polkit-1/actions/
+#$(datadir)/polkit-1/actions/
+polkitactions_DATA = org.fedoraproject.SimpleFileShare.policy
+
+dbusservicedir  	 = /usr/share/dbus-1/system-services
+#/usr/share/dbus-1/system-services
+#$(datadir)/dbus-1/system-services
+dbusservice_in_files	 = org.fedoraproject.SimpleFileShare.service.in
+dbusservice_DATA 	= $(dbusservice_in_files:.service.in=.service)
+
+$(dbusservice_DATA): $(dbusservice_in_files) Makefile
+	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< >$@
 
+EXTRA_DIST = $(dbusconf_DATA) $(dbusxml_DATA) $(polkitactions_DATA) $(dbusservice_DATA) org.fedoraproject.SimpleFileShare.xml
 
-EXTRA_DIST = $(dbusconf_DATA)	
+DISTCLEANFILES = $(dbusservice_DATA)
diff --git a/sfshare-daemon/data/org.fedoraproject.SimpleFileShare.service b/sfshare-daemon/data/org.fedoraproject.SimpleFileShare.service.in
index ebf3c37..1df92b9 100755
--- a/sfshare-daemon/data/org.fedoraproject.SimpleFileShare.service
+++ b/sfshare-daemon/data/org.fedoraproject.SimpleFileShare.service.in
@@ -1,4 +1,4 @@
 [D-BUS Service]
 Name=org.fedoraproject.SimpleFileShare
-Exec=/usr/sbin/sfshared
+Exec=@libexecdir@/sfshared
 User=root
diff --git a/sfshare-daemon/src/dbus_service.c b/sfshare-daemon/dbus_service.c
index c2f0258..3e08c6d 100644..100755
--- a/sfshare-daemon/src/dbus_service.c
+++ b/sfshare-daemon/dbus_service.c
@@ -1,4 +1,6 @@
 /*
+ *  dbus_service.c
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public
  *  License as published by the Free Software Foundation; either
@@ -13,8 +15,8 @@
  *  License along with this library; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Author: Jan Lipovsky <janlipovsky@gmail.com>
  */
-
 #include <dbus/dbus-glib.h>
 #include <dbus/dbus-glib-lowlevel.h>
 #include <glib.h>
diff --git a/sfshare-daemon/src/dbus_service.h b/sfshare-daemon/dbus_service.h
index 79897a1..3888352 100644..100755
--- a/sfshare-daemon/src/dbus_service.h
+++ b/sfshare-daemon/dbus_service.h
@@ -1,4 +1,6 @@
 /*
+ *  dbus_service.c
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public
  *  License as published by the Free Software Foundation; either
@@ -13,6 +15,7 @@
  *  License along with this library; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Author: Jan Lipovsky <janlipovsky@gmail.com>
  */
 
 #ifndef DBUS_SERVICE_H
diff --git a/sfshare-daemon/src/dbus_service_glue.h b/sfshare-daemon/dbus_service_glue.h
index ec1b428..ec1b428 100644..100755
--- a/sfshare-daemon/src/dbus_service_glue.h
+++ b/sfshare-daemon/dbus_service_glue.h
diff --git a/sfshare-daemon/src/samba_share.c b/sfshare-daemon/samba_share.c
index 32987bf..a58042b 100644..100755
--- a/sfshare-daemon/src/samba_share.c
+++ b/sfshare-daemon/samba_share.c
@@ -1,4 +1,6 @@
 /*
+ *  samba_share.c
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public
  *  License as published by the Free Software Foundation; either
@@ -13,6 +15,7 @@
  *  License along with this library; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Author: Jan Lipovsky <janlipovsky@gmail.com>
  */
 
 #include <string.h> /* strlen, strstr */
diff --git a/sfshare-daemon/src/samba_share.h b/sfshare-daemon/samba_share.h
index ae9e34b..2519382 100644..100755
--- a/sfshare-daemon/src/samba_share.h
+++ b/sfshare-daemon/samba_share.h
@@ -1,4 +1,6 @@
 /*
+ *  samba_share.h
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public
  *  License as published by the Free Software Foundation; either
@@ -13,6 +15,7 @@
  *  License along with this library; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Author: Jan Lipovsky <janlipovsky@gmail.com>
  */
 
 #ifndef SAMBA_SHARE_H
diff --git a/sfshare-daemon/src/sfshare_errors.h b/sfshare-daemon/sfshare_errors.h
index 6c7bc4b..069c9e2 100644..100755
--- a/sfshare-daemon/src/sfshare_errors.h
+++ b/sfshare-daemon/sfshare_errors.h
@@ -1,4 +1,6 @@
 /*
+ *  sfshare_errors.c
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public
  *  License as published by the Free Software Foundation; either
@@ -13,6 +15,7 @@
  *  License along with this library; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Author: Jan Lipovsky <janlipovsky@gmail.com>
  */
 
 #ifndef SFSHARE_ERRORS_H
diff --git a/sfshare-daemon/src/sfshared.c b/sfshare-daemon/sfshared.c
index 0a2ee3b..2784fcf 100644..100755
--- a/sfshare-daemon/src/sfshared.c
+++ b/sfshare-daemon/sfshared.c
@@ -1,4 +1,6 @@
 /*
+ *  sfshared.c
+ *
  *  This program is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU General Public
  *  License as published by the Free Software Foundation; either
@@ -13,6 +15,7 @@
  *  License along with this library; if not, write to the Free
  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ *  Author: Jan Lipovsky <janlipovsky@gmail.com>
  */
 
 #include <stdio.h>
diff --git a/sfshare-daemon/src/Makefile.am b/sfshare-daemon/src/Makefile.am
deleted file mode 100755
index f4c11a2..0000000
--- a/sfshare-daemon/src/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AM_CFLAGS=-Wall @POLKIT_CFLAGS@ @GTK_CFLAGS@ @DBUS_GLIB_CFLAGS@
-AM_LDFLAGS= @POLKIT_LIBS@ @GTK_LIBS@ @DBUS_GLIB_LIBS@
-
-
-bin_PROGRAMS = sfshared
-sfshared_SOURCES = dbus_service.c dbus_service.h samba_share.c  sfshared.c dbus_service_glue.h samba_share.h sfshare_errors.h