← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/lib/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/lib/Makefile.am
1
1
noinst_LIBRARIES = libpsensor.a
2
2
 
3
 
libpsensor_a_CFLAGS = -pedantic -Werror
4
 
 
5
3
libpsensor_a_SOURCES = \
 
4
        amd.h \
 
5
        cpu.h \
6
6
        measure.h measure.c \
7
7
        color.h color.c \
 
8
        log.h log.c \
8
9
        psensor.h psensor.c\
9
10
        hdd.h hdd.c\
10
11
        nvidia.h \
11
 
        lmsensor.h lmsensor.c
 
12
        lmsensor.h lmsensor.c \
 
13
        p_io.h p_io.c \
 
14
        url.c url.h
 
15
 
 
16
AM_CPPFLAGS = -Wall -Werror
12
17
 
13
18
if NVIDIA
14
19
libpsensor_a_SOURCES += nvidia.c
15
20
endif
 
21
if LIBATIADL
 
22
LIBS += $(LIBATIADL_LIBS)
 
23
AM_CPPFLAGS += $(LIBATIADL_CFLAGS)
 
24
libpsensor_a_SOURCES += amd.c
 
25
endif
 
26
 
 
27
if GTOP
 
28
libpsensor_a_SOURCES += cpu.c
 
29
LIBS += $(GTOP_LIBS)
 
30
AM_CPPFLAGS += $(GTOP_CFLAGS)
 
31
endif
 
32
 
 
33
if JSON
 
34
libpsensor_a_SOURCES += psensor_json.h psensor_json.c
 
35
LIBS += $(JSON_LIBS)
 
36
AM_CPPFLAGS += $(JSON_CFLAGS)
 
37
endif
 
38
 
 
39
EXTRA_DIST=$(libpsensor_a_SOURCES) \
 
40
        amd.c \
 
41
        cpu.c \
 
42
        nvidia.c
 
 
b'\\ No newline at end of file'