blob: e332d38a2c3f82308e0000c49b7e5e46808bd2bf (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
- Fix building with --as-needed
- Fix parallel make by defining two new targets
- Fix one spelling error
- Respect LDFLAGS
--- a/configure.in 2011-01-02 19:48:13.000000000 +0100
+++ b/configure.in 2011-01-03 04:35:34.000000000 +0100
@@ -141,7 +141,7 @@
if [test "$HAVE_NVCONTROL" = "yes"]; then
echo "- NV-CONTROL support enabled"
else
- echo "- NV-CONROL support disabled"
+ echo "- NV-CONTROL support disabled"
fi
if [test "$HAVE_GTK2" = "yes"]; then
echo "- GTK2 GUI enabled"
--- a/src/Makefile.in 2011-01-02 19:48:13.000000000 +0100
+++ b/src/Makefile.in 2011-01-03 04:35:34.000000000 +0100
@@ -16,7 +16,7 @@
ifeq ($(HAVE_NVCONTROL), yes)
DEPS=$(libbackend) $(libnvcontrol)
INCLUDES=@X11_CFLAGS@ -I./backend -I./nvcontrol -I..
- LIBS=@X11_LIBS@ -L./backend -lbackend -L./nvcontrol -lnvcontrol
+ LIBS=-L./backend -lbackend -L./nvcontrol -lnvcontrol @X11_LIBS@
else
DEPS=$(libbackend)
INCLUDES=-I./backend -I./nvcontrol -I..
@@ -30,12 +30,17 @@
all: all-recursive nvclock smartdimmer
+$(libbackend):
+ $(MAKE) -C backend
+
+$(libnvcontrol):
+ $(MAKE) -C nvcontrol
nvclock: $(DEPS) $(LIB) nvclock.c
- $(CC) $(CFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nvclock $(nvclock_SOURCES) $(INCLUDES) $(LIBS)
smartdimmer: $(DEPS) $(LIB) smartdimmer.c
- $(CC) $(CFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o smartdimmer $(smartdimmer_SOURCES) $(INCLUDES) $(LIBS)
clean: clean-recursive clean-app
--- a/src/gtk/Makefile.in 2011-01-02 19:48:13.000000000 +0100
+++ b/src/gtk/Makefile.in 2011-01-03 04:35:34.000000000 +0100
@@ -33,7 +33,7 @@
all: $(PROGRAM)
nvclock_gtk: $(DEPS) $(OBJECTS)
- $(CC) $(CFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
+ $(CC) $(CFLAGS) $(LDFLAGS) -o nvclock_gtk $(OBJECTS) $(libbackend) $(LIBS)
clean:
rm -f nvclock_gtk *.core *.o *.exe
--- a/src/qt/Makefile.in 2011-01-02 19:48:13.000000000 +0100
+++ b/src/qt/Makefile.in 2011-01-03 04:35:34.000000000 +0100
@@ -31,7 +31,7 @@
all: $(PROGRAM)
nvclock_qt: $(DEPS) qt_nvclock.moc qt_xfree.moc $(OBJECTS)
- $(CXX) $(CXXFLAGS) -o nvclock_qt $(CXXFLAGS) $(OBJECTS) $(LIBS)
+ $(CXX) $(CXXFLAGS) $(LDFLAGS) -o nvclock_qt $(OBJECTS) $(LIBS)
clean:
rm -f nvclock_qt *.core *.moc *.o
|
GitWeb
