fixed automake

5 files changed, 36 insertions, 35 deletions

diff --git a/configure.ac b/configure.ac
index 9c78a0f..76c40db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@
 
 # if doing version bump - make sure you update sensors-applet-mateconf
 # version checking to add old version if no changes to config
-AC_INIT([MATE Sensors Applet], [2.2.7], [[email protected]],
-[sensors-applet])
+AC_INIT([MATE Sensors Applet], [2.2.7], [[email protected]],
+[mate-sensors-applet])
 
 AC_CONFIG_SRCDIR([sensors-applet/main.c])
 AM_CONFIG_HEADER([sensors-applet/config.h])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index cc83f96..95d564c 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 LIBS = $(GLIB_LIBS)
 
 # also build the libsensorsplugin library
-lib_LTLIBRARIES = libsensors-applet-plugin.la
+lib_LTLIBRARIES = libmate-sensors-applet-plugin.la
 
-libsensors_applet_plugin_la_SOURCES = sensors-applet-plugin.c 
-libsensors_applet_plugin_la_LDFLAGS = -export-dynamic
\ No newline at end of file
+libmate_sensors_applet_plugin_la_SOURCES = sensors-applet-plugin.c 
+libmate_sensors_applet_plugin_la_LDFLAGS = -export-dynamic
diff --git a/lib/Makefile.in b/lib/Makefile.in
index 6d2c7b9..b912da6 100644
--- a/lib/Makefile.in
+++ b/lib/Makefile.in
@@ -67,14 +67,15 @@ am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
-libsensors_applet_plugin_la_LIBADD =
-am_libsensors_applet_plugin_la_OBJECTS = sensors-applet-plugin.lo
-libsensors_applet_plugin_la_OBJECTS =  \
-	$(am_libsensors_applet_plugin_la_OBJECTS)
-libsensors_applet_plugin_la_LINK = $(LIBTOOL) --tag=CC \
+libmate_sensors_applet_plugin_la_LIBADD =
+am_libmate_sensors_applet_plugin_la_OBJECTS =  \
+	sensors-applet-plugin.lo
+libmate_sensors_applet_plugin_la_OBJECTS =  \
+	$(am_libmate_sensors_applet_plugin_la_OBJECTS)
+libmate_sensors_applet_plugin_la_LINK = $(LIBTOOL) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
-	$(AM_CFLAGS) $(CFLAGS) $(libsensors_applet_plugin_la_LDFLAGS) \
-	$(LDFLAGS) -o $@
+	$(AM_CFLAGS) $(CFLAGS) \
+	$(libmate_sensors_applet_plugin_la_LDFLAGS) $(LDFLAGS) -o $@
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/sensors-applet
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -88,8 +89,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(libsensors_applet_plugin_la_SOURCES)
-DIST_SOURCES = $(libsensors_applet_plugin_la_SOURCES)
+SOURCES = $(libmate_sensors_applet_plugin_la_SOURCES)
+DIST_SOURCES = $(libmate_sensors_applet_plugin_la_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -268,9 +269,9 @@ INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 
 
 # also build the libsensorsplugin library
-lib_LTLIBRARIES = libsensors-applet-plugin.la
-libsensors_applet_plugin_la_SOURCES = sensors-applet-plugin.c 
-libsensors_applet_plugin_la_LDFLAGS = -export-dynamic
+lib_LTLIBRARIES = libmate-sensors-applet-plugin.la
+libmate_sensors_applet_plugin_la_SOURCES = sensors-applet-plugin.c 
+libmate_sensors_applet_plugin_la_LDFLAGS = -export-dynamic
 all: all-am
 
 .SUFFIXES:
@@ -336,8 +337,8 @@ clean-libLTLIBRARIES:
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libsensors-applet-plugin.la: $(libsensors_applet_plugin_la_OBJECTS) $(libsensors_applet_plugin_la_DEPENDENCIES) 
-	$(libsensors_applet_plugin_la_LINK) -rpath $(libdir) $(libsensors_applet_plugin_la_OBJECTS) $(libsensors_applet_plugin_la_LIBADD) $(LIBS)
+libmate-sensors-applet-plugin.la: $(libmate_sensors_applet_plugin_la_OBJECTS) $(libmate_sensors_applet_plugin_la_DEPENDENCIES) 
+	$(libmate_sensors_applet_plugin_la_LINK) -rpath $(libdir) $(libmate_sensors_applet_plugin_la_OBJECTS) $(libmate_sensors_applet_plugin_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
diff --git a/sensors-applet/Makefile.am b/sensors-applet/Makefile.am
index eae9e71..ce3cb01 100644
--- a/sensors-applet/Makefile.am
+++ b/sensors-applet/Makefile.am
@@ -20,8 +20,8 @@ else
 libmatenotify_SRC =
 endif
 
-libexec_PROGRAMS = sensors-applet
-sensors_applet_SOURCES = main.c \
+libexec_PROGRAMS = mate-sensors-applet
+mate_sensors_applet_SOURCES = main.c \
 		about-dialog.c \
 		about-dialog.h \
 		active-sensor.c \
diff --git a/sensors-applet/Makefile.in b/sensors-applet/Makefile.in
index 27d3593..363bd63 100644
--- a/sensors-applet/Makefile.in
+++ b/sensors-applet/Makefile.in
@@ -35,7 +35,7 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-libexec_PROGRAMS = sensors-applet$(EXEEXT)
+libexec_PROGRAMS = mate-sensors-applet$(EXEEXT)
 subdir = sensors-applet
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/config.h.in
@@ -49,22 +49,22 @@ CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(headerdir)"
 PROGRAMS = $(libexec_PROGRAMS)
-am__sensors_applet_SOURCES_DIST = main.c about-dialog.c about-dialog.h \
-	active-sensor.c active-sensor.h prefs-dialog.c prefs-dialog.h \
-	sensor-config-dialog.c sensor-config-dialog.h sensors-applet.c \
-	sensors-applet.h sensors-applet-sensor.h \
+am__mate_sensors_applet_SOURCES_DIST = main.c about-dialog.c \
+	about-dialog.h active-sensor.c active-sensor.h prefs-dialog.c \
+	prefs-dialog.h sensor-config-dialog.c sensor-config-dialog.h \
+	sensors-applet.c sensors-applet.h sensors-applet-sensor.h \
 	sensors-applet-plugins.c sensors-applet-plugins.h \
 	sensors-applet-mateconf.c sensors-applet-mateconf.h \
 	active-sensor-libmatenotify.c active-sensor-libmatenotify.h
 @LIBMATENOTIFY_TRUE@am__objects_1 =  \
 @LIBMATENOTIFY_TRUE@	active-sensor-libmatenotify.$(OBJEXT)
-am_sensors_applet_OBJECTS = main.$(OBJEXT) about-dialog.$(OBJEXT) \
+am_mate_sensors_applet_OBJECTS = main.$(OBJEXT) about-dialog.$(OBJEXT) \
 	active-sensor.$(OBJEXT) prefs-dialog.$(OBJEXT) \
 	sensor-config-dialog.$(OBJEXT) sensors-applet.$(OBJEXT) \
 	sensors-applet-plugins.$(OBJEXT) \
 	sensors-applet-mateconf.$(OBJEXT) $(am__objects_1)
-sensors_applet_OBJECTS = $(am_sensors_applet_OBJECTS)
-sensors_applet_LDADD = $(LDADD)
+mate_sensors_applet_OBJECTS = $(am_mate_sensors_applet_OBJECTS)
+mate_sensors_applet_LDADD = $(LDADD)
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -78,8 +78,8 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
 	$(LDFLAGS) -o $@
-SOURCES = $(sensors_applet_SOURCES)
-DIST_SOURCES = $(am__sensors_applet_SOURCES_DIST)
+SOURCES = $(mate_sensors_applet_SOURCES)
+DIST_SOURCES = $(am__mate_sensors_applet_SOURCES_DIST)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -282,7 +282,7 @@ INCLUDES = -DMATELOCALEDIR=\""$(datadir)/locale/"\" \
 @LIBMATENOTIFY_TRUE@libmatenotify_SRC = active-sensor-libmatenotify.c \
 @LIBMATENOTIFY_TRUE@		active-sensor-libmatenotify.h
 
-sensors_applet_SOURCES = main.c \
+mate_sensors_applet_SOURCES = main.c \
 		about-dialog.c \
 		about-dialog.h \
 		active-sensor.c \
@@ -403,9 +403,9 @@ clean-libexecPROGRAMS:
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-sensors-applet$(EXEEXT): $(sensors_applet_OBJECTS) $(sensors_applet_DEPENDENCIES) 
-	@rm -f sensors-applet$(EXEEXT)
-	$(LINK) $(sensors_applet_OBJECTS) $(sensors_applet_LDADD) $(LIBS)
+mate-sensors-applet$(EXEEXT): $(mate_sensors_applet_OBJECTS) $(mate_sensors_applet_DEPENDENCIES) 
+	@rm -f mate-sensors-applet$(EXEEXT)
+	$(LINK) $(mate_sensors_applet_OBJECTS) $(mate_sensors_applet_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)