diff options
author | Simon Busch <morphis@gravedo.de> | 2012-03-21 06:36:44 +0100 |
---|---|---|
committer | Simon Busch <morphis@gravedo.de> | 2012-03-21 06:36:44 +0100 |
commit | 3f8e10502158dfdf6aa5ada6d6dd688d53822005 (patch) | |
tree | e4e66aa73c5fe35455241de3066de9db3c861f99 | |
parent | 47d64cb92f787db8f24febdb958be5a871a1195d (diff) | |
download | cornucopia-3f8e10502158dfdf6aa5ada6d6dd688d53822005.tar.gz cornucopia-3f8e10502158dfdf6aa5ada6d6dd688d53822005.tar.bz2 cornucopia-3f8e10502158dfdf6aa5ada6d6dd688d53822005.zip |
fsousaged: adjust makefiles for distribution
-rw-r--r-- | fsousaged/Makefile.am | 2 | ||||
-rw-r--r-- | fsousaged/conf/default/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/conf/herring/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/conf/htc_qualcomm_dream/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/conf/htcleo/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/conf/nexusone/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/conf/openmoko_gta/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/conf/palm_pre/Makefile.am | 4 | ||||
-rw-r--r-- | fsousaged/src/plugins/dbus_service/Makefile.am | 14 | ||||
-rw-r--r-- | fsousaged/src/plugins/lowlevel_android/Makefile.am | 19 | ||||
-rw-r--r-- | fsousaged/src/plugins/lowlevel_kernel26/Makefile.am | 19 | ||||
-rw-r--r-- | fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am | 19 | ||||
-rw-r--r-- | fsousaged/src/plugins/lowlevel_openmoko/Makefile.am | 19 | ||||
-rw-r--r-- | fsousaged/src/plugins/lowlevel_palmpre/Makefile.am | 19 |
14 files changed, 72 insertions, 67 deletions
diff --git a/fsousaged/Makefile.am b/fsousaged/Makefile.am index 2b8a4172..9fb54de6 100644 --- a/fsousaged/Makefile.am +++ b/fsousaged/Makefile.am @@ -9,6 +9,8 @@ SUBDIRS = \ tests \ $(NULL) +DISTCHECK_CONFIGURE_FLAGS = --disable-datafiles + MAINTAINERCLEANFILES = \ aclocal.m4 compile config.guess config.sub \ configure depcomp install-sh ltmain.sh \ diff --git a/fsousaged/conf/default/Makefile.am b/fsousaged/conf/default/Makefile.am index d5296584..d9e69177 100644 --- a/fsousaged/conf/default/Makefile.am +++ b/fsousaged/conf/default/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/default dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/conf/herring/Makefile.am b/fsousaged/conf/herring/Makefile.am index d5296584..7ebbf564 100644 --- a/fsousaged/conf/herring/Makefile.am +++ b/fsousaged/conf/herring/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/herring dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/conf/htc_qualcomm_dream/Makefile.am b/fsousaged/conf/htc_qualcomm_dream/Makefile.am index d5296584..d60c0f0a 100644 --- a/fsousaged/conf/htc_qualcomm_dream/Makefile.am +++ b/fsousaged/conf/htc_qualcomm_dream/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/htc_qualcomm_dream dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/conf/htcleo/Makefile.am b/fsousaged/conf/htcleo/Makefile.am index d5296584..63fa4296 100644 --- a/fsousaged/conf/htcleo/Makefile.am +++ b/fsousaged/conf/htcleo/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/htcleo dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/conf/nexusone/Makefile.am b/fsousaged/conf/nexusone/Makefile.am index d5296584..299bfefb 100644 --- a/fsousaged/conf/nexusone/Makefile.am +++ b/fsousaged/conf/nexusone/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/nexusone dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/conf/openmoko_gta/Makefile.am b/fsousaged/conf/openmoko_gta/Makefile.am index d5296584..7415c0a5 100644 --- a/fsousaged/conf/openmoko_gta/Makefile.am +++ b/fsousaged/conf/openmoko_gta/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/openmoko_gta dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/conf/palm_pre/Makefile.am b/fsousaged/conf/palm_pre/Makefile.am index d5296584..4f7a7c72 100644 --- a/fsousaged/conf/palm_pre/Makefile.am +++ b/fsousaged/conf/palm_pre/Makefile.am @@ -2,9 +2,7 @@ include $(top_srcdir)/Makefile.decl NULL= -THISDIR = `basename $$PWD` - -confdir = $(sysconfdir)/freesmartphone/conf/$(THISDIR) +confdir = $(sysconfdir)/freesmartphone/conf/palm_pre dist_conf_DATA = \ fsousaged.conf \ $(NULL) diff --git a/fsousaged/src/plugins/dbus_service/Makefile.am b/fsousaged/src/plugins/dbus_service/Makefile.am index 90f48d41..e025373c 100644 --- a/fsousaged/src/plugins/dbus_service/Makefile.am +++ b/fsousaged/src/plugins/dbus_service/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = \ noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = \ - $(top_srcdir)/src/lib/libfsousage.la \ + $(top_builddir)/src/lib/libfsousage.la \ $(GLIB_LIBS) \ $(GEE_LIBS) \ $(FSO_LIBS) \ @@ -50,13 +50,15 @@ dbus_service_la_LIBADD = $(progs_ldadd) dbus_service_la_LDFLAGS = -no-undefined -module -avoid-version dbus_service_la_LIBTOOLFLAGS = --tag=disable-static +EXTRA_DIST += \ + $(dbus_service_la_VALASOURCES) \ + $(dbus_service_la_SOURCES) + CLEANFILES = \ - plugin.c \ - plugin.h \ - *.la \ - *.lo \ - $(NULL) + $(dbus_service_la_SOURCES) \ + $(NULL) MAINTAINERCLEANFILES = \ Makefile.in \ + $(dbus_service_la_SOURCES) \ $(NULL) diff --git a/fsousaged/src/plugins/lowlevel_android/Makefile.am b/fsousaged/src/plugins/lowlevel_android/Makefile.am index abd7910c..025cc6b1 100644 --- a/fsousaged/src/plugins/lowlevel_android/Makefile.am +++ b/fsousaged/src/plugins/lowlevel_android/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = \ noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = \ - $(top_srcdir)/src/lib/libfsousage.la \ + $(top_builddir)/src/lib/libfsousage.la \ $(GEE_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ @@ -49,13 +49,16 @@ lowlevel_android_la_LIBADD = $(progs_ldadd) lowlevel_android_la_LDFLAGS = -no-undefined -module -avoid-version lowlevel_android_la_LIBTOOLFLAGS = --tag=disable-static +EXTRA_DIST += \ + $(lowlevel_android_la_VALASOURCES) \ + $(lowlevel_android_la_SOURCES) \ + $(NULL) + CLEANFILES = \ - plugin.c \ - plugin.h \ - *.la \ - *.lo \ - $(NULL) + $(lowlevel_android_la_SOURCES) \ + $(NULL) MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) + $(lowlevel_android_la_SOURCES) \ + Makefile.in \ + $(NULL) diff --git a/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am b/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am index 0982adef..f1ac1b43 100644 --- a/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am +++ b/fsousaged/src/plugins/lowlevel_kernel26/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = \ noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = \ - $(top_srcdir)/src/lib/libfsousage.la \ + $(top_builddir)/src/lib/libfsousage.la \ $(GEE_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ @@ -49,13 +49,16 @@ lowlevel_kernel26_la_LIBADD = $(progs_ldadd) lowlevel_kernel26_la_LDFLAGS = -no-undefined -module -avoid-version lowlevel_kernel26_la_LIBTOOLFLAGS = --tag=disable-static +EXTRA_DIST += \ + $(lowlevel_kernel26_la_VALASOURCES) \ + $(lowlevel_kernel26_la_SOURCES) \ + $(NULL) + CLEANFILES = \ - plugin.c \ - plugin.h \ - *.la \ - *.lo \ - $(NULL) + $(lowlevel_kernel26_la_SOURCES) \ + $(NULL) MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) + $(lowlevel_kernel26_la_SOURCES) \ + Makefile.in \ + $(NULL) diff --git a/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am b/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am index 3612fb82..8466d2da 100644 --- a/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am +++ b/fsousaged/src/plugins/lowlevel_kernel26_staysalive/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = \ noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = \ - $(top_srcdir)/src/lib/libfsousage.la \ + $(top_builddir)/src/lib/libfsousage.la \ $(GEE_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ @@ -49,13 +49,16 @@ lowlevel_kernel26_staysalive_la_LIBADD = $(progs_ldadd) lowlevel_kernel26_staysalive_la_LDFLAGS = -no-undefined -module -avoid-version lowlevel_kernel26_staysalive_la_LIBTOOLFLAGS = --tag=disable-static +EXTRA_DIST += \ + $(lowlevel_kernel26_staysalive_la_SOURCES) \ + $(lowlevel_kernel26_staysalive_la_VALASOURCES) \ + $(NULL) + CLEANFILES = \ - plugin.c \ - plugin.h \ - *.la \ - *.lo \ - $(NULL) + $(lowlevel_kernel26_staysalive_la_SOURCES) \ + $(NULL) MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) + $(lowlevel_kernel26_staysalive_la_SOURCES) \ + Makefile.in \ + $(NULL) diff --git a/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am b/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am index cc0f9c4d..89800c14 100644 --- a/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am +++ b/fsousaged/src/plugins/lowlevel_openmoko/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = \ noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = \ - $(top_srcdir)/src/lib/libfsousage.la \ + $(top_builddir)/src/lib/libfsousage.la \ $(GEE_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ @@ -49,13 +49,16 @@ lowlevel_openmoko_la_LIBADD = $(progs_ldadd) lowlevel_openmoko_la_LDFLAGS = -no-undefined -module -avoid-version lowlevel_openmoko_la_LIBTOOLFLAGS = --tag=disable-static +EXTRA_DIST += \ + $(lowlevel_openmoko_la_VALASOURCES) \ + $(lowlevel_openmoko_la_SOURCES) \ + $(NULL) + CLEANFILES = \ - plugin.c \ - plugin.h \ - *.la \ - *.lo \ - $(NULL) + $(lowlevel_openmoko_la_SOURCES) \ + $(NULL) MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) + $(lowlevel_openmoko_la_SOURCES) \ + Makefile.in \ + $(NULL) diff --git a/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am b/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am index 5c33b26f..f16ff4ca 100644 --- a/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am +++ b/fsousaged/src/plugins/lowlevel_palmpre/Makefile.am @@ -13,7 +13,7 @@ AM_CFLAGS = \ noinst_PROGRAMS = $(TEST_PROGS) progs_ldadd = \ - $(top_srcdir)/src/lib/libfsousage.la \ + $(top_builddir)/src/lib/libfsousage.la \ $(GEE_LIBS) \ $(FSO_LIBS) \ $(GLIB_LIBS) \ @@ -49,13 +49,16 @@ lowlevel_palmpre_la_LIBADD = $(progs_ldadd) lowlevel_palmpre_la_LDFLAGS = -no-undefined -module -avoid-version lowlevel_palmpre_la_LIBTOOLFLAGS = --tag=disable-static +EXTRA_DIST += \ + $(lowlevel_palmpre_la_VALASOURCES) \ + $(lowlevel_palmpre_la_SOURCES) \ + $(NULL) + CLEANFILES = \ - plugin.c \ - plugin.h \ - *.la \ - *.lo \ - $(NULL) + $(lowlevel_palmpre_la_SOURCES) \ + $(NULL) MAINTAINERCLEANFILES = \ - Makefile.in \ - $(NULL) + $(lowlevel_palmpre_la_SOURCES) \ + Makefile.in \ + $(NULL) |