summaryrefslogtreecommitdiff
blob: 3f7b35b43879a31cd1b6117e60eaa73ca25cb8d9 (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
--- qpxtool-0.7.0.old/console/f1tattoo/Makefile	2010-01-09 12:05:18.000000000 +0100
+++ qpxtool-0.7.0/console/f1tattoo/Makefile	2010-01-09 12:21:39.000000000 +0100
@@ -5,7 +5,7 @@
 
 CXXFLAGS += -I. -I../../lib/include $(LPNG_INC)
 CFLAGS   += -I. -I../../lib/include $(LPNG_INC)
-LDLIBS   += -lqpxtransport -lqpxyamaha $(LPNG_LIB) -L../../lib/lib
+LDLIBS   += -lqpxtransport -lqpxyamaha -L../../lib/lib $(LPNG_LIB)
 
 $(BIN): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
--- qpxtool-0.7.0/console/qscan/Makefile.orig	2010-01-23 19:37:37.201487022 +0100
+++ qpxtool-0.7.0/console/qscan/Makefile	2010-01-23 19:44:07.915487435 +0100
@@ -5,7 +5,7 @@
 
 CXXFLAGS += -I. -I../../lib/include
 CFLAGS   += -I. -I../../lib/include
-LDLIBS   += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib $(LIBS_DL)
+LDLIBS   += -lqpxtransport -lqpxscan -lqpxplextor -L../../lib/lib
 
 $(BIN): $(OBJS)
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LDLIBS)
--- qpxtool-0.7.0/lib/qpxscan/Makefile.orig	2010-01-25 18:27:39.373641192 +0100
+++ qpxtool-0.7.0/lib/qpxscan/Makefile	2010-01-25 18:18:03.420641552 +0100
@@ -12,6 +12,6 @@
 VER_MINOR  = 7
 VER_MICRO  = 0
 
-LDLIBS += -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET)
+LDLIBS += $(LIBS_DL) -lqpxtransport -lqpxplextor -L../lib $(LIBS_INET)
 
 include ../Makefile.lib