Removed dbus generated files from the dist archive

diff --git a/src/common/dbus/Makefile.am b/src/common/dbus/Makefile.am
index 4e6b551..ebdc000 100644 (file)
--- a/src/common/dbus/Makefile.am
+++ b/src/common/dbus/Makefile.am
@@ -13,9 +13,9 @@ DBUS_BUILT_SOURCES = \
 
 DBUS_BUILT_DOCS = \
     gum-dbus-user-doc-gen-org.tizen.SecurityAccounts.gUserManagement.User.xml \
-    gum-dbus-user-doc-gen-org.tizen.SecurityAccounts.gUserManagement.UserService.xml \
+    gum-dbus-user-service-doc-gen-org.tizen.SecurityAccounts.gUserManagement.UserService.xml \
     gum-dbus-group-doc-gen-org.tizen.SecurityAccounts.gUserManagement.Group.xml \
-    gum-dbus-user-doc-gen-org.tizen.SecurityAccounts.gUserManagement.GroupService.xml \
+    gum-dbus-group-service-doc-gen-org.tizen.SecurityAccounts.gUserManagement.GroupService.xml \
     $(NULL)
 
 DBUS_INTERFACE_PREFIX="org.tizen.SecurityAccounts.gUserManagement."
@@ -56,13 +56,14 @@ noinst_LTLIBRARIES = libgum-dbus-glue.la
 libgum_dbus_glue_la_CPPFLAGS = \
     $(GUM_COMMON_INCLUDES) \
     $(GUM_COMMON_CFLAGS) \
+    $(top_builddir)/src/ \
     $(NULL)
 
 libgum_dbus_glue_la_LIBADD = \
     $(GUM_COMMON_LIBS) \
     $(NULL)
 
-libgum_dbus_glue_la_SOURCES =  \
+nodist_libgum_dbus_glue_la_SOURCES = \
    $(DBUS_BUILT_SOURCES) \
    $(NULL)
 

diff --git a/test/common/Makefile.am b/test/common/Makefile.am
index 3db5eb1..f0207d3 100644 (file)
--- a/test/common/Makefile.am
+++ b/test/common/Makefile.am
@@ -14,6 +14,7 @@ commontest_CFLAGS = \
     $(CHECK_CFLAGS) \
     -U G_LOG_DOMAIN \
     -I$(top_srcdir)/src \
+    -I$(top_builddir)/src/ \
     -DG_LOG_DOMAIN=\"gum-test-common\"
 
 commontest_LDADD = \

diff --git a/test/daemon/Makefile.am b/test/daemon/Makefile.am
index 61b62f7..8aec706 100644 (file)
--- a/test/daemon/Makefile.am
+++ b/test/daemon/Makefile.am
@@ -13,6 +13,7 @@ daemontest_SOURCES = daemon-test.c
 
 daemontest_CFLAGS = \
     -I$(top_srcdir)/src \
+    -I$(top_builddir)/src/ \
     $(GUMD_INCLUDES) \
     $(TEST_CFLAGS) \
     $(GUMD_CFLAGS) \

diff --git a/tools/prepare-tizen.sh b/tools/prepare-tizen.sh
index 9d9c998..b22249f 100755 (executable)
--- a/tools/prepare-tizen.sh
+++ b/tools/prepare-tizen.sh
@@ -14,13 +14,7 @@ echo "CURR dir = $currdir"
 
 mkdir -p $2 && \
 cd $2 && \
-git rm -r *; rm -rf packaging;
+git rm -r -f *; 
 tar -xzvf $currdir/$1 -C $2 --strip-components 1 && \
-mkdir -p packaging && \
-cp dists/rpm/tizen/packaging/gumd.spec packaging/ && \
-cp dists/rpm/tizen/packaging/gumd.manifest packaging/ && \
-cp dists/rpm/tizen/packaging/gumd.changes packaging/ && \
-cp dists/rpm/tizen/packaging/libgum.manifest packaging/ && \
-cp dists/rpm/tizen/packaging/gumd-tizen.conf packaging/ && \
-git add -f *;
 cp $currdir/.gitignore $2/; 
+git add -f *; git add .gitignore;