X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2FMakefile.in;h=df28a98b9abd6ba28d3b47cc7484d0a25acf7fcd;hb=f3bcb228ae6763abdf0b60f3e83ae742d9b1ff56;hp=30a577d7dadb10356df75c281cdd4706dc492de3;hpb=c6d9fd757f429c0889e1a7620c7e7be69e6f71c9;p=psensor.git diff --git a/src/Makefile.in b/src/Makefile.in index 30a577d..df28a98 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -34,23 +34,28 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -@JSON_TRUE@am__append_1 = libpsensor_json -@JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_2 = server -@LIBATIADL_FALSE@am__append_3 = -pedantic +@JSON_TRUE@@LIBMICROHTTPD_TRUE@am__append_1 = server bin_PROGRAMS = 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 @LIBNOTIFY_TRUE@am__append_5 = $(LIBNOTIFY_LIBS) @LIBNOTIFY_TRUE@am__append_6 = $(LIBNOTIFY_CFLAGS) -@APPINDICATOR_TRUE@am__append_7 = ui_appindicator.h ui_appindicator.c +@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) -@UNITY_TRUE@am__append_12 = $(UNITY_CFLAGS) -@UNITY_TRUE@am__append_13 = unity/libpsensor_unity.a $(UNITY_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_14 = rsensor.h rsensor.c plib/url.c plib/url.h -@CURL_TRUE@@JSON_TRUE@am__append_15 = $(CURL_LIBS) $(JSON_LIBS) -@CURL_TRUE@@JSON_TRUE@am__append_16 = $(CURL_CFLAGS) $(JSON_CFLAGS) +@LIBATIADL_TRUE@am__append_12 = $(LIBATIADL_CFLAGS) +@LIBATIADL_TRUE@am__append_13 = $(LIBATIADL_LIBS) +@ATASMART_TRUE@am__append_14 = $(ATASMART_CFLAGS) +@ATASMART_TRUE@am__append_15 = $(ATASMART_LIBS) +@UNITY_TRUE@am__append_16 = ui_unity.h ui_unity.c +@UNITY_TRUE@am__append_17 = $(UNITY_CFLAGS) +@UNITY_TRUE@am__append_18 = $(UNITY_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_19 = rsensor.h rsensor.c +@CURL_TRUE@@JSON_TRUE@am__append_20 = $(CURL_LIBS) $(JSON_LIBS) +@CURL_TRUE@@JSON_TRUE@am__append_21 = $(CURL_CFLAGS) $(JSON_CFLAGS) subdir = src DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ $(srcdir)/Makefile.in @@ -65,19 +70,20 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" PROGRAMS = $(bin_PROGRAMS) am__psensor_SOURCES_DIST = compat.h cfg.h cfg.c graph.h graph.c main.c \ - ui.h ui.c 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_notify.h ui_notify.c \ - ui_appindicator.h ui_appindicator.c rsensor.h rsensor.c \ - plib/url.c plib/url.h + 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 \ + ui_notify.h ui_notify.c ui_appindicator.c ui_unity.h \ + ui_unity.c rsensor.h rsensor.c @LIBNOTIFY_TRUE@am__objects_1 = ui_notify.$(OBJEXT) @APPINDICATOR_TRUE@am__objects_2 = ui_appindicator.$(OBJEXT) -@CURL_TRUE@@JSON_TRUE@am__objects_3 = rsensor.$(OBJEXT) url.$(OBJEXT) +@UNITY_TRUE@am__objects_3 = ui_unity.$(OBJEXT) +@CURL_TRUE@@JSON_TRUE@am__objects_4 = rsensor.$(OBJEXT) am_psensor_OBJECTS = cfg.$(OBJEXT) graph.$(OBJEXT) main.$(OBJEXT) \ ui.$(OBJEXT) ui_color.$(OBJEXT) ui_graph.$(OBJEXT) \ ui_pref.$(OBJEXT) ui_sensorlist.$(OBJEXT) \ - ui_sensorpref.$(OBJEXT) $(am__objects_1) $(am__objects_2) \ - $(am__objects_3) + ui_sensorpref.$(OBJEXT) ui_status.$(OBJEXT) $(am__objects_1) \ + $(am__objects_2) $(am__objects_3) $(am__objects_4) psensor_OBJECTS = $(am_psensor_OBJECTS) psensor_LDADD = $(LDADD) DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) @@ -128,7 +134,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = plib lib unity glade libpsensor_json server +DIST_SUBDIRS = lib glade server DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -159,6 +165,8 @@ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ APPINDICATOR_CFLAGS = @APPINDICATOR_CFLAGS@ APPINDICATOR_LIBS = @APPINDICATOR_LIBS@ +ATASMART_CFLAGS = @ATASMART_CFLAGS@ +ATASMART_LIBS = @ATASMART_LIBS@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ @@ -208,9 +216,10 @@ LIBMICROHTTPD_LIBS = @LIBMICROHTTPD_LIBS@ LIBNOTIFY_CFLAGS = @LIBNOTIFY_CFLAGS@ LIBNOTIFY_LIBS = @LIBNOTIFY_LIBS@ LIBOBJS = @LIBOBJS@ -LIBS = plib/libplib.a lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) \ - $(SENSORS_LIBS) $(am__append_5) $(am__append_8) \ - $(am__append_11) $(am__append_13) $(am__append_15) +LIBS = lib/libpsensor.a $(GTK_LIBS) $(GCONF_LIBS) $(SENSORS_LIBS) \ + $(am__append_3) $(am__append_5) $(am__append_8) \ + $(am__append_11) $(am__append_13) $(am__append_15) \ + $(am__append_18) $(am__append_20) LTLIBICONV = @LTLIBICONV@ LTLIBINTL = @LTLIBINTL@ LTLIBOBJS = @LTLIBOBJS@ @@ -301,18 +310,23 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = plib lib unity glade $(am__append_1) $(am__append_2) +SUBDIRS = lib glade $(am__append_1) AM_LDFLAGS = -Wl,--as-needed -AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ + +# -no-deprecated-declarations to avoid some glib deprecation warnings +AM_CPPFLAGS = -Wno-deprecated-declarations -Wall -Werror \ + -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\" \ -I$(top_srcdir)/src/lib -I$(top_srcdir)/src/unity \ $(GTK_CFLAGS) $(GCONF_CFLAGS) $(SENSORS_CFLAGS) \ - $(am__append_3) $(am__append_6) $(am__append_9) \ - $(am__append_10) $(am__append_12) $(am__append_16) + $(am__append_2) $(am__append_6) $(am__append_9) \ + $(am__append_10) $(am__append_12) $(am__append_14) \ + $(am__append_17) $(am__append_21) psensor_SOURCES = compat.h cfg.h cfg.c graph.h graph.c main.c ui.h \ - ui.c 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 $(am__append_4) $(am__append_7) \ - $(am__append_14) + 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 all: all-recursive @@ -408,7 +422,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_pref.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorlist.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_sensorpref.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/url.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_status.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ui_unity.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -423,20 +438,6 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -url.o: plib/url.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT url.o -MD -MP -MF $(DEPDIR)/url.Tpo -c -o url.o `test -f 'plib/url.c' || echo '$(srcdir)/'`plib/url.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/url.Tpo $(DEPDIR)/url.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plib/url.c' object='url.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o url.o `test -f 'plib/url.c' || echo '$(srcdir)/'`plib/url.c - -url.obj: plib/url.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT url.obj -MD -MP -MF $(DEPDIR)/url.Tpo -c -o url.obj `if test -f 'plib/url.c'; then $(CYGPATH_W) 'plib/url.c'; else $(CYGPATH_W) '$(srcdir)/plib/url.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/url.Tpo $(DEPDIR)/url.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='plib/url.c' object='url.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o url.obj `if test -f 'plib/url.c'; then $(CYGPATH_W) 'plib/url.c'; else $(CYGPATH_W) '$(srcdir)/plib/url.c'; fi` install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"