Project build improvements

* Added maitainercleanfiles to root Makefile.am
* Changed examples/ and test/ binaries to noinst_PROGRAMS
* Added EOL to the end of src/Makefile
* Fixed project 'distcheck' target

diff --git a/Makefile.am b/Makefile.am
index 849f15a..85f1a70 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,9 @@
 SUBDIRS = src examples test
 
 ACLOCAL_AMFLAGS = -I m4
+
+MAINTAINERCLEANFILES = \
+       *.in \
+       *~
+
+DISTCLEANFILES = $(MAINTAINERCLEANFILES)

diff --git a/examples/Makefile.am b/examples/Makefile.am
index ae06eb9..dd8d0fb 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,8 +1,8 @@
-bin_PROGRAMS = gmovies_test \
+noinst_PROGRAMS = gmovies_test \
        gtranslate_test
 
 gmovies_test_SOURCES = \
-       gmovies.c
+       $(top_srcdir)/examples/gmovies.c
 
 gmovies_test_CFLAGS = \
        $(DEPS_CFLAGS)
@@ -11,7 +11,7 @@ gmovies_test_LDADD = \
        $(DEPS_LIBS)
 
 gtranslate_test_SOURCES = \
-       gtranslate.c
+       $(top_srcdir)/examples/gtranslate.c
 
 gtranslate_test_CFLAGS = \
        $(DEPS_CFLAGS)

diff --git a/src/Makefile.am b/src/Makefile.am
index 044d2cd..4f3efcd 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = mvs \
        maevies_service
 
 mvs_SOURCES = \
-       main.c
+       $(top_srcdir)/src/main.c
 
 mvs_CFLAGS = \
        $(DEPS_CFLAGS)
@@ -11,26 +11,26 @@ mvs_LDADD = \
        $(DEPS_LIBS)
 
 maevies_service_SOURCES = \
-       maevies-service.c \
-       mvs-minfo-provider.c \
-       mvs-minfo-provider.h \
-       mvs-minfo-provider-service.c \
-       mvs-minfo-provider-service.h \
-       mvs-minfo-provider-service-glue.h \
-       mvs-tmdb-movie.c \
-       mvs-tmdb-movie.h \
-       mvs-tmdb-image.c \
-       mvs-tmdb-image.h \
-       mvs-watc-movie.c \
-       mvs-watc-movie.h \
-       mvs-tmdb-movie-service.c \
-       mvs-tmdb-movie-service.h \
-       mvs-tmdb-movie-service-glue.h \
-       mvs-watc-movie-service.c \
-       mvs-watc-movie-service.h \
-       mvs-watc-movie-service-glue.h \
-       mvs-marshal.c \
-       mvs-marshal.h
+       $(top_srcdir)/src/maevies-service.c \
+       $(top_srcdir)/src/mvs-minfo-provider.c \
+       $(top_srcdir)/src/mvs-minfo-provider.h \
+       $(top_srcdir)/src/mvs-minfo-provider-service.c \
+       $(top_srcdir)/src/mvs-minfo-provider-service.h \
+       $(top_srcdir)/src/mvs-minfo-provider-service-glue.h \
+       $(top_srcdir)/src/mvs-tmdb-movie.c \
+       $(top_srcdir)/src/mvs-tmdb-movie.h \
+       $(top_srcdir)/src/mvs-tmdb-image.c \
+       $(top_srcdir)/src/mvs-tmdb-image.h \
+       $(top_srcdir)/src/mvs-watc-movie.c \
+       $(top_srcdir)/src/mvs-watc-movie.h \
+       $(top_srcdir)/src/mvs-tmdb-movie-service.c \
+       $(top_srcdir)/src/mvs-tmdb-movie-service.h \
+       $(top_srcdir)/src/mvs-tmdb-movie-service-glue.h \
+       $(top_srcdir)/src/mvs-watc-movie-service.c \
+       $(top_srcdir)/src/mvs-watc-movie-service.h \
+       $(top_srcdir)/src/mvs-watc-movie-service-glue.h \
+       $(top_srcdir)/src/mvs-marshal.c \
+       $(top_srcdir)/src/mvs-marshal.h
 
 maevies_service_CFLAGS = \
        $(DEPS_CFLAGS)
@@ -42,19 +42,19 @@ MAINTAINERCLEANFILES =      \
        *.in \
        *~
 
-mvs-minfo-provider-service-glue.h: mvs-minfo-provider.xml
+mvs-minfo-provider-service-glue.h: $(top_srcdir)/src/mvs-minfo-provider.xml
        dbus-binding-tool --mode=glib-server --prefix=mvs_minfo_provider_service $< > $@
 
-mvs-tmdb-movie-service-glue.h: mvs-tmdb-movie.xml
+mvs-tmdb-movie-service-glue.h: $(top_srcdir)/src/mvs-tmdb-movie.xml
        dbus-binding-tool --mode=glib-server --prefix=mvs_tmdb_movie_service $< > $@
 
-mvs-watc-movie-service-glue.h: mvs-watc-movie.xml
+mvs-watc-movie-service-glue.h: $(top_srcdir)/src/mvs-watc-movie.xml
        dbus-binding-tool --mode=glib-server --prefix=mvs_watc_movie_service $< > $@
 
-mvs-marshal.h: marshal.list
+mvs-marshal.h: $(top_srcdir)/src/marshal.list
        glib-genmarshal --header --prefix=mvs_marshal $< > $@
 
-mvs-marshal.c: marshal.list
+mvs-marshal.c: $(top_srcdir)/src/marshal.list
        glib-genmarshal --body --prefix=mvs_marshal $< > $@
 
 DISTCLEANFILES = $(MAINTAINERCLEANFILES)
@@ -64,4 +64,4 @@ BUILT_SOURCES =                       \
        mvs-tmdb-movie-service-glue.h \
        mvs-watc-movie-service-glue.h \
        mvs-marshal.h \
-       mvs-marshal.c
\ No newline at end of file
+       mvs-marshal.c

diff --git a/test/Makefile.am b/test/Makefile.am
index 88bc45a..70278eb 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,7 +1,7 @@
-bin_PROGRAMS = mvs-minfo-provider-test
+noinst_PROGRAMS = mvs-minfo-provider-test
 
 mvs_minfo_provider_test_SOURCES = \
-       mvs-minfo-provider-test.c \
+       $(top_srcdir)/test/mvs-minfo-provider-test.c \
        $(top_srcdir)/src/mvs-minfo-provider.c \
        $(top_srcdir)/src/mvs-minfo-provider.h \
        $(top_srcdir)/src/mvs-tmdb-movie.c \