merged translation

[psensor.git] / src / Makefile.in

diff --git a/src/Makefile.in b/src/Makefile.in
index cf78eef..3ce1622 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -53,7 +53,8 @@ POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
 @JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_1 = server
-bin_PROGRAMS = psensor$(EXEEXT)
+@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@bin_PROGRAMS =  \
+@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@    psensor$(EXEEXT)
 @GTOP_TRUE@am__append_2 = $(GTOP_CFLAGS)
 @GTOP_TRUE@am__append_3 = $(GTOP_LIBS)
 @LIBNOTIFY_TRUE@am__append_4 = ui_notify.h ui_notify.c
@@ -62,8 +63,8 @@ bin_PROGRAMS = psensor$(EXEEXT)
 @APPINDICATOR_TRUE@am__append_7 = ui_appindicator.c 
 @APPINDICATOR_TRUE@am__append_8 = $(APPINDICATOR_LIBS)
 @APPINDICATOR_TRUE@am__append_9 = $(APPINDICATOR_CFLAGS)
-@NVIDIA_TRUE@am__append_10 = $(NVIDIA_CFLAGS)
-@NVIDIA_TRUE@am__append_11 = $(NVIDIA_LIBS)
+@NVIDIA_TRUE@@X11_TRUE@am__append_10 = $(NVIDIA_CFLAGS)
+@NVIDIA_TRUE@@X11_TRUE@am__append_11 = $(NVIDIA_LIBS)
 @LIBATIADL_TRUE@am__append_12 = $(LIBATIADL_CFLAGS)
 @LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_LIBS)
 @ATASMART_TRUE@am__append_14 = $(ATASMART_CFLAGS)
@@ -359,16 +360,16 @@ AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \
        $(am__append_2) $(am__append_6) $(am__append_9) \
        $(am__append_10) $(am__append_12) $(am__append_14) \
        $(am__append_17) $(am__append_21)
+@GCONF_TRUE@@GTK_TRUE@@X11_TRUE@@XEXT_TRUE@dist_man_MANS = psensor.1
 psensor_SOURCES = cfg.h cfg.c graph.h graph.c main.c ui.h ui.c \
        ui_appindicator.h ui_color.h ui_color.c ui_graph.h ui_graph.c \
        ui_pref.h ui_pref.c ui_sensorlist.h ui_sensorlist.c \
        ui_sensorpref.h ui_sensorpref.c ui_status.h ui_status.c \
        $(am__append_4) $(am__append_7) $(am__append_16) \
        $(am__append_19)
-dist_man_MANS = psensor.1
 EXTRA_DIST = description.txt psensor.schemas
-@GCONF_SCHEMAS_INSTALL_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
-@GCONF_SCHEMAS_INSTALL_TRUE@schema_DATA = psensor.schemas
+@GCONF_TRUE@schemadir = $(GCONF_SCHEMA_FILE_DIR)
+@GCONF_TRUE@schema_DATA = psensor.schemas
 all: all-recursive
 
 .SUFFIXES:
@@ -787,7 +788,7 @@ distclean-generic:
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
        @echo "it deletes files that may require special tools to rebuild."
-@GCONF_SCHEMAS_INSTALL_FALSE@install-data-local:
+@GCONF_FALSE@install-data-local:
 clean: clean-recursive
 
 clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
@@ -880,8 +881,8 @@ uninstall-man: uninstall-man1
        uninstall-schemaDATA
 
 
-@GCONF_SCHEMAS_INSTALL_TRUE@install-data-local:
-@GCONF_SCHEMAS_INSTALL_TRUE@   GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
+@GCONF_TRUE@install-data-local:
+@GCONF_TRUE@   GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_srcdir)/src/$(schema_DATA)
 
 psensor.1: main.c $(top_srcdir)/configure.ac
        $(MAKE) $(AM_MAKEFLAGS) psensor$(EXEEXT)