desktop-data-model r7245 - in trunk: . ddm

From: walters svn gnome org
To: svn-commits-list gnome org
Subject: desktop-data-model r7245 - in trunk: . ddm
Date: Tue, 29 Jan 2008 23:38:20 +0000 (GMT)
Author: walters
Date: Tue Jan 29 23:38:20 2008
New Revision: 7245
URL: http://svn.gnome.org/viewvc/desktop-data-model?rev=7245&view=rev

Log:
Houston, we make distcheck.

We don't need the BUILT_SRC_DIR crack; the BUILT_SRC_DIR
should be the build directory.

Don't need DDM_SRCDIR; Automake implicitly creates an environment
variable srcdir for us.

Look in $(srcdir) for sources in our build rules.

Remove lots of nodist_ prefixes which were a legacy of our old
custom dist infrastructure.

Add some missed files to dist/header lists.


Modified:
   trunk/Makefile-libddm.am
   trunk/Makefile-libengine.am
   trunk/Makefile-libhippo.am
   trunk/Makefile.am
   trunk/ddm/test-condition-reduce.c
   trunk/ddm/test-feed-object.c
   trunk/ddm/test-static-file-parser.c
   trunk/ddm/test-utils.c

Modified: trunk/Makefile-libddm.am
==============================================================================
--- trunk/Makefile-libddm.am	(original)
+++ trunk/Makefile-libddm.am	Tue Jan 29 23:38:20 2008
@@ -1,12 +1,11 @@
 pkgconfig_DATA += ddm-1.pc
 
-EXTRA_DIST += ddm-1.pc.in
+EXTRA_DIST += ddm-1.pc.in ddm/test-data.xml ddm/test-local-data.xml
 
 lib_LTLIBRARIES += libddm-1.la
 
 libddm_1_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
 	$(LIBDDM_CFLAGS)		\
 	 -DDDM_COMPILATION=1
 
@@ -16,19 +15,19 @@
 libddm_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(DDM_LT_CURRENT):$(DDM_LT_REVISION):$(DDM_LT_AGE) -no-undefined
 
 DDM_MARSHAL_LIST=ddm/ddm-marshal.list
-DDM_MARSHAL_HEADER=$(MARSHAL_DIR)/ddm-marshal.h
-DDM_MARSHAL_BODY=$(MARSHAL_DIR)/ddm-marshal.c
+DDM_MARSHAL_HEADER=ddm-marshal.h
+DDM_MARSHAL_BODY=ddm-marshal.c
 
 $(DDM_MARSHAL_HEADER): $(DDM_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) 2>/dev/null || true
-	$(GLIB_GENMARSHAL) --prefix=ddm_marshal $(DDM_MARSHAL_LIST) --header > $(DDM_MARSHAL_HEADER)
+	$(GLIB_GENMARSHAL) --prefix=ddm_marshal $(srcdir)/$(DDM_MARSHAL_LIST) --header > $(DDM_MARSHAL_HEADER)
 
 $(DDM_MARSHAL_BODY): $(DDM_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) 2>/dev/null || true
-	(echo "#include \"ddm-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=ddm_marshal $(DDM_MARSHAL_LIST) --body) > $(DDM_MARSHAL_BODY)
+	(echo "#include \"ddm-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=ddm_marshal $(srcdir)/$(DDM_MARSHAL_LIST) --body) > $(DDM_MARSHAL_BODY)
+
+EXTRA_DIST += $(DDM_MARSHAL_LIST)
 
 libddmincludedir = $(includedir)/ddm-1/ddm
-nodist_libddminclude_HEADERS=		\
+libddminclude_HEADERS=		\
 	ddm/ddm.h			\
 	ddm/ddm-client.h		\
 	ddm/ddm-client-notification.h	\
@@ -37,6 +36,7 @@
 	ddm/ddm-data-model.h		\
 	ddm/ddm-data-model-backend.h	\
 	ddm/ddm-data-model-dbus.h	\
+	ddm/ddm-data-model-dbus-internal.h	\
 	ddm/ddm-data-resource.h		\
 	ddm/ddm-data-query.h		\
 	ddm/ddm-feed.h			\
@@ -77,7 +77,7 @@
 MAINTAINERCLEANFILES +=	$(LIBDDM_BUILT_SOURCEFILES)
 BUILT_SOURCES += $(LIBDDM_BUILT_SOURCEFILES)
 
-nodist_libddm_1_la_SOURCES=$(LIBDDM_SOURCEFILES) $(LIBDDM_BUILT_SOURCEFILES)
+libddm_1_la_SOURCES=$(LIBDDM_SOURCEFILES) $(LIBDDM_BUILT_SOURCEFILES)
 
 ######################################################################
 # Build test-specific source files into a convenience library
@@ -91,7 +91,7 @@
 
 libddm_test_la_LIBADD = $(LIBDDM_LIBS) libddm-1.la
 
-nodist_libddm_test_la_SOURCES =				\
+libddm_test_la_SOURCES =				\
 	ddm/static-file-backend.c	\
 	ddm/static-file-backend.h	\
 	ddm/static-file-parser.c	\
@@ -121,60 +121,57 @@
 
 TESTS += $(ddm_tests)
 
-TESTS_ENVIRONMENT=DDM_SRCDIR=ddm
-
 ALL_DDM_TESTS =
 
 test_condition_parser_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_condition_parser_LDADD=libddm-1.la
 
-nodist_test_condition_parser_SOURCES=ddm/test-condition-parser.c
+test_condition_parser_SOURCES=ddm/test-condition-parser.c
 ALL_DDM_TESTS += $(nodist_test_condition_parser_SOURCES)
 
 test_condition_reduce_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_condition_reduce_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_condition_reduce_SOURCES=ddm/test-condition-reduce.c
+test_condition_reduce_SOURCES=ddm/test-condition-reduce.c
 ALL_DDM_TESTS += $(nodist_test_condition_reduce_SOURCES)
 
 test_feed_object_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_feed_object_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_feed_object_SOURCES=ddm/test-feed-object.c
+test_feed_object_SOURCES=ddm/test-feed-object.c
 ALL_DDM_TESTS += $(nodist_test_feed_object_SOURCES)
 
 test_ddm_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS)
 test_ddm_LDADD=libddm-1.la
 
-nodist_test_ddm_SOURCES=ddm/test-ddm.c
+test_ddm_SOURCES=ddm/test-ddm.c
 ALL_DDM_TESTS += $(nodist_test_ddm_SOURCES)
 
 test_multipart_fetch_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_multipart_fetch_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_multipart_fetch_SOURCES=ddm/test-multipart-fetch.c
+test_multipart_fetch_SOURCES=ddm/test-multipart-fetch.c
 ALL_DDM_TESTS += $(nodist_test_multipart_fetch_SOURCES)
 
 test_notification_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_notification_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_notification_SOURCES=ddm/test-notification.c
+test_notification_SOURCES=ddm/test-notification.c
 ALL_DDM_TESTS += $(nodist_test_notification_SOURCES)
-
 test_rules_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_rules_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_rules_SOURCES=ddm/test-rules.c
+test_rules_SOURCES=ddm/test-rules.c
 ALL_DDM_TESTS += $(nodist_test_rules_SOURCES)
 
 test_static_file_parser_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_static_file_parser_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_static_file_parser_SOURCES=ddm/test-static-file-parser.c
+test_static_file_parser_SOURCES=ddm/test-static-file-parser.c
 ALL_DDM_TESTS += $(nodist_test_static_file_parser_SOURCES)
 
 test_static_file_backend_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDDM_CFLAGS) -DDDM_COMPILATION=1
 test_static_file_backend_LDADD=libddm-1.la libddm-test.la
 
-nodist_test_static_file_backend_SOURCES=ddm/test-static-file-backend.c
+test_static_file_backend_SOURCES=ddm/test-static-file-backend.c
 ALL_DDM_TESTS += $(nodist_test_static_file_backend_SOURCES)

Modified: trunk/Makefile-libengine.am
==============================================================================
--- trunk/Makefile-libengine.am	(original)
+++ trunk/Makefile-libengine.am	Tue Jan 29 23:38:20 2008
@@ -2,7 +2,6 @@
 
 libengine_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
 	$(LIBENGINE_CFLAGS)		\
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
 
@@ -16,16 +15,16 @@
 # libengine_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined
 
 ENGINE_MARSHAL_LIST=engine/hippo-engine-marshal.list
-ENGINE_MARSHAL_HEADER=$(MARSHAL_DIR)/hippo-engine-marshal.h
-ENGINE_MARSHAL_BODY=$(MARSHAL_DIR)/hippo-engine-marshal.c
+ENGINE_MARSHAL_HEADER=hippo-engine-marshal.h
+ENGINE_MARSHAL_BODY=hippo-engine-marshal.c
+
+EXTRA_DIST += $(ENGINE_MARSHAL_LIST)
 
 $(ENGINE_MARSHAL_HEADER): $(ENGINE_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) || true
-	$(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(ENGINE_MARSHAL_LIST) --header > $(ENGINE_MARSHAL_HEADER)
+	$(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(srcdir)/$(ENGINE_MARSHAL_LIST) --header > $(ENGINE_MARSHAL_HEADER)
 
 $(ENGINE_MARSHAL_BODY): $(ENGINE_MARSHAL_LIST)
-	mkdir $(MARSHAL_DIR) || true
-	(echo "#include \"hippo-engine-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(ENGINE_MARSHAL_LIST) --body) > $(ENGINE_MARSHAL_BODY)
+	(echo "#include \"hippo-engine-marshal.h\""; $(GLIB_GENMARSHAL) --prefix=hippo_engine_marshal $(srcdir)/$(ENGINE_MARSHAL_LIST) --body) > $(ENGINE_MARSHAL_BODY)
 
 LIBENGINE_SOURCEFILES =						\
 	engine/hippo-chat-room.c		\

Modified: trunk/Makefile-libhippo.am
==============================================================================
--- trunk/Makefile-libhippo.am	(original)
+++ trunk/Makefile-libhippo.am	Tue Jan 29 23:38:20 2008
@@ -2,7 +2,6 @@
 
 libhippo_la_CPPFLAGS =			\
 	$(AM_CPPFLAGS)			\
-	-I $(MARSHAL_DIR)		\
 	$(LIBHIPPO_CFLAGS)		\
 	-DDDM_I_KNOW_THIS_IS_UNSTABLE=1
 

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Tue Jan 29 23:38:20 2008
@@ -3,26 +3,18 @@
 # so we manually put AM_CPPFLAGS in the target flags
 AM_CPPFLAGS=-DHIPPO_COMPILATION -DHIPPO_OS_LINUX -DVERSION_FILE=\"$(pkgdatadir)/version\" -I$(top_builddir)/config
 
-# the "config" dir seems like a convenient place that's already 
-# in everyone's include path ... I dunno
-BUILT_SRC_DIR=$(top_builddir)/config/hippo
-# Generated marshallers go into this directory as well
-MARSHAL_DIR=$(BUILT_SRC_DIR)
-ENUMS_DIR=$(BUILT_SRC_DIR)
-
 ## we install a file containing our version, so the running app 
 ## can check its version vs. the installed app
 versiondir=$(pkgdatadir)
 version_DATA=version
 
-EXTRA_DIST = version.in LICENSE
+EXTRA_DIST = version.in
 
 # if srcdir!=builddir, clean out maintainer-clean files from builddir
 # this allows dist to pass.
 distclean-local:
 	if test $(srcdir) != . ; then		\
 	  rm -f $(MAINTAINERCLEANFILES) ;	\
-	  rmdir $(BUILT_SRC_DIR) ;		\
 	fi
 
 # These are added to using += in the included files

Modified: trunk/ddm/test-condition-reduce.c
==============================================================================
--- trunk/ddm/test-condition-reduce.c	(original)
+++ trunk/ddm/test-condition-reduce.c	Tue Jan 29 23:38:20 2008
@@ -67,11 +67,11 @@
 
     model = ddm_data_model_new_no_backend();
 
-    srcdir = g_getenv("DDM_SRCDIR");
+    srcdir = g_getenv("srcdir");
     if (srcdir == NULL)
-        g_error("DDM_SRCDIR is not set");
+        g_error("srcidr is not set");
 
-    filename = g_build_filename(srcdir, "test-data.xml", NULL);
+    filename = g_build_filename(srcdir, "ddm", "test-data.xml", NULL);
     if (!ddm_static_file_parse(filename, model, &error))
         g_error("Failed to parse test data: %s", error->message);
 

Modified: trunk/ddm/test-feed-object.c
==============================================================================
--- trunk/ddm/test-feed-object.c	(original)
+++ trunk/ddm/test-feed-object.c	Tue Jan 29 23:38:20 2008
@@ -72,11 +72,11 @@
 
     model = ddm_data_model_new_no_backend();
 
-    srcdir = g_getenv("DDM_SRCDIR");
+    srcdir = g_getenv("srcdir");
     if (srcdir == NULL)
-        g_error("DDM_SRCDIR is not set");
+        g_error("srcdir is not set");
 
-    filename = g_build_filename(srcdir, "test-data.xml", NULL);
+    filename = g_build_filename(srcdir, "ddm", "test-data.xml", NULL);
     if (!ddm_static_file_parse(filename, model, &error))
         g_error("Failed to parse test data: %s", error->message);
 

Modified: trunk/ddm/test-static-file-parser.c
==============================================================================
--- trunk/ddm/test-static-file-parser.c	(original)
+++ trunk/ddm/test-static-file-parser.c	Tue Jan 29 23:38:20 2008
@@ -22,11 +22,11 @@
 
     model = ddm_data_model_new_no_backend();
 
-    srcdir = g_getenv("DDM_SRCDIR");
+    srcdir = g_getenv("srcdir");
     if (srcdir == NULL)
-        g_error("DDM_SRCDIR is not set");
+        g_error("srcdir is not set");
 
-    filename = g_build_filename(srcdir, "test-data.xml", NULL);
+    filename = g_build_filename(srcdir, "ddm", "test-data.xml", NULL);
     if (!ddm_static_file_parse(filename, model, &error))
         g_error("Failed to parse test data: %s", error->message);
 

Modified: trunk/ddm/test-utils.c
==============================================================================
--- trunk/ddm/test-utils.c	(original)
+++ trunk/ddm/test-utils.c	Tue Jan 29 23:38:20 2008
@@ -14,11 +14,11 @@
 
     g_type_init();
 
-    srcdir = g_getenv("DDM_SRCDIR");
+    srcdir = g_getenv("srcdir");
     if (srcdir == NULL)
-        g_error("DDM_SRCDIR is not set");
+        g_error("srcdir is not set");
 
-    filename = g_build_filename(srcdir, "test-data.xml", NULL);
+    filename = g_build_filename(srcdir, "ddm", "test-data.xml", NULL);
     model = ddm_static_file_model_new(filename, &error);
     if (model == NULL)
         g_error("Failed to create test model: %s", error->message);
@@ -26,7 +26,7 @@
     g_free(filename);
 
     if (load_local) {
-        filename = g_build_filename(srcdir, "test-local-data.xml", NULL);
+        filename = g_build_filename(srcdir, "ddm", "test-local-data.xml", NULL);
         if (!ddm_static_load_local_file(filename, model, &error))
             g_error("Failed to add_local data to test model: %s", error->message);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]