← Back to branch summary

~jfi/ubuntu/quantal/psensor/new-upstream

« back to all changes in this revision

Viewing changes to src/server/Makefile.am

  • Committer: Package Import Robot
  • Author(s): Micah Gersten
  • Date: 2012-01-21 22:41:34 UTC
  • mfrom: (3.1.5 sid)
  • Revision ID: package-import@ubuntu.com-20120121224134-mty23d3917ng5ujd
Tags: 0.6.2.16-1ubuntu1
* Merge from Debian testing.  Remaining changes:
  + Modifed build-dep to add NVidia and Application Indicator support
  + Only add an nvidia-settings build-dep on i386 and amd64

* Add a patch to drop the deprecated g_thread_init() call
  - add debian/patches/drop_g_thread_init.patch
  - add debian/patches/series

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/Makefile.am
1
1
bin_PROGRAMS =  psensor-server
2
2
psensor_server_SOURCES = server.c server.h
3
3
 
4
 
AM_CPPFLAGS = -pedantic -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
 
4
AM_CPPFLAGS = -Wall -Werror -DDEFAULT_WWW_DIR=\""$(pkgdatadir)/www"\"\
5
5
        -I$(top_srcdir)/src \
6
6
        -I$(top_srcdir)/src/lib \
7
 
        -I$(top_srcdir)/src/libpsensor_json \
8
7
        $(SENSORS_CFLAGS)\
9
8
        $(JSON_CFLAGS)\
10
9
        $(LIBMICROHTTPD_CFLAGS)
12
11
DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
13
12
 
14
13
LIBS = \
15
 
        ../plib/libplib.a \
16
14
        ../lib/libpsensor.a \
17
 
        ../libpsensor_json/libpsensor_json.a \
18
 
        $(SENSORS_LIBS)\
19
 
        $(JSON_LIBS)\
 
15
        $(SENSORS_LIBS) \
 
16
        $(JSON_LIBS) \
20
17
        $(LIBMICROHTTPD_LIBS)
21
18
 
22
 
if LUA
23
 
AM_CPPFLAGS += $(LUA_CFLAGS)
24
 
LIBS += ../plib/libplib_luatpl.a \
25
 
        $(LUA_LIBS)
26
 
psensor_server_SOURCES += server_lua.h server_lua.c
27
 
endif
28
 
 
29
19
if GTOP
30
20
AM_CPPFLAGS += $(GTOP_CFLAGS)
31
 
LIBS += $(GTOP_LIBS)
 
21
LIBS += $(GTOP_LIBS) 
 
22
AM_LDFLAGS = -Wl,--as-needed
32
23
psensor_server_SOURCES += sysinfo.h sysinfo.c
33
24
endif
34
25
 
35
 
 
36
 
 
37
26
dist_man_MANS =  psensor-server.1
38
27
EXTRA_DIST = description.txt
39
28
psensor-server.1: server.c $(top_srcdir)/configure.ac