moved json code to src/lib

[psensor.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 194ed36..189bcde 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,12 @@
-SUBDIRS = plib lib unity glade
+SUBDIRS = lib glade
 
 AM_LDFLAGS = -Wl,--as-needed 
 
-if JSON
-SUBDIRS += libpsensor_json
-endif
-
 if LIBMICROHTTPD
 if JSON
-if LUA
 SUBDIRS += server
 endif
 endif
-endif
 
 AM_CPPFLAGS = -Wall -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
        -I$(top_srcdir)/src/lib \
@@ -24,7 +18,6 @@ AM_CPPFLAGS = -Wall -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
 DEFS = -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" -DLOCALEDIR=\"$(localedir)\" @DEFS@
 
 LIBS = \
-       plib/libplib.a \
        lib/libpsensor.a \
        $(GTK_LIBS)\
        $(GCONF_LIBS)\
@@ -43,6 +36,11 @@ psensor_SOURCES = \
        ui_sensorlist.h ui_sensorlist.c \
        ui_sensorpref.h ui_sensorpref.c
 
+if GTOP
+AM_CPPFLAGS += $(GTOP_CFLAGS)
+LIBS += $(GTOP_LIBS)
+endif
+
 if LIBNOTIFY
 psensor_SOURCES += ui_notify.h ui_notify.c
 LIBS += $(LIBNOTIFY_LIBS)
@@ -60,14 +58,20 @@ AM_CPPFLAGS += $(NVIDIA_CFLAGS)
 LIBS +=  $(NVIDIA_LIBS)
 endif
 
+if LIBATIADL
+AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
+LIBS += $(LIBATIADL_LIBS)
+endif
+
 if UNITY
+psensor_SOURCES += ui_unity.h ui_unity.c
 AM_CPPFLAGS += $(UNITY_CFLAGS)
-LIBS += unity/libpsensor_unity.a $(UNITY_LIBS) 
+LIBS += $(UNITY_LIBS) 
 endif
 
 if CURL
 if JSON
-psensor_SOURCES += rsensor.h rsensor.c plib/url.c plib/url.h
+psensor_SOURCES += rsensor.h rsensor.c
 LIBS += $(CURL_LIBS) $(JSON_LIBS)
 AM_CPPFLAGS += $(CURL_CFLAGS) $(JSON_CFLAGS)
 endif