|
305
|
1 |
--- hpoj-0.91/lib/hpojip/Makefile.in.orig 2007-06-08 10:28:41.421420000 -0400
|
|
|
2 |
+++ hpoj-0.91/lib/hpojip/Makefile.in 2007-06-08 10:29:41.785840000 -0400
|
|
|
3 |
@@ -26,7 +26,7 @@
|
|
|
4 |
# TODO: Detect system endianness in configure script!
|
|
|
5 |
# For now, little-endian (Intel LSB-first) is assumed.
|
|
|
6 |
|
|
|
7 |
-CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
|
|
|
8 |
+CFLAGS=@CFLAGS@ @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
|
|
|
9 |
|
|
|
10 |
%.shared.o: %.c $(INCLUDES)
|
|
|
11 |
$(CC) $(CFLAGS) -DHPOJIP_INTERNAL -fPIC -c -o $@ $<
|
|
|
12 |
@@ -41,7 +41,7 @@
|
|
|
13 |
rm -f $(DISTCLEANS)
|
|
|
14 |
|
|
|
15 |
$(SOLONG): $(SOCOMPS)
|
|
|
16 |
- $(CC) $(CFLAGS) -shared -Wl,-soname,$(SOSHORT) -o $(SOLONG) $(SOCOMPS) -lc -lm
|
|
|
17 |
+ $(CC) $(CFLAGS) -shared -Wl,-h,$(SOSHORT) -o $(SOLONG) $(SOCOMPS) -lc -lm
|
|
|
18 |
ln -sf $(SOLONG) $(SOSHORT)
|
|
|
19 |
ln -sf $(SOLONG) $(SONOVER)
|
|
|
20 |
|
|
|
21 |
--- hpoj-0.91/lib/ptal/Makefile.in.orig 2007-06-08 10:30:21.347858000 -0400
|
|
|
22 |
+++ hpoj-0.91/lib/ptal/Makefile.in 2007-06-08 10:30:45.547938000 -0400
|
|
|
23 |
@@ -17,7 +17,7 @@
|
|
|
24 |
MLCDDIR=../../mlcd
|
|
|
25 |
INCLUDES=Makefile $(INCLUDEDIR)/ptal.h ptal-internal.h $(MLCDDIR)/mlcd.h
|
|
|
26 |
|
|
|
27 |
-CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@ -DUCD_COMPATIBLE
|
|
|
28 |
+CFLAGS=@CFLAGS@ @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@ -DUCD_COMPATIBLE
|
|
|
29 |
|
|
|
30 |
%.shared.o: %.c $(INCLUDES)
|
|
|
31 |
$(CC) $(CFLAGS) -fPIC -c -o $@ $<
|
|
|
32 |
@@ -32,7 +32,7 @@
|
|
|
33 |
rm -f $(DISTCLEANS)
|
|
|
34 |
|
|
|
35 |
$(SOLONG): $(SOCOMPS)
|
|
|
36 |
- $(CC) $(CFLAGS) @LIBSNMP_CMDLINE@ -shared -Wl,-soname,$(SOSHORT) -o $(SOLONG) $(SOCOMPS) -lc
|
|
|
37 |
+ $(CC) $(CFLAGS) @LIBSNMP_CMDLINE@ -shared -Wl,-h,$(SOSHORT) -o $(SOLONG) $(SOCOMPS) -lc
|
|
|
38 |
ln -sf $(SOLONG) $(SOSHORT)
|
|
|
39 |
ln -sf $(SOLONG) $(SONOVER)
|
|
|
40 |
|
|
|
41 |
--- hpoj-0.91/lib/sane/Makefile.in.orig 2007-06-08 10:31:14.714977000 -0400
|
|
|
42 |
+++ hpoj-0.91/lib/sane/Makefile.in 2007-06-08 10:31:27.799661000 -0400
|
|
|
43 |
@@ -16,7 +16,7 @@
|
|
|
44 |
INCLUDEDIR=../../include
|
|
|
45 |
INCLUDES=Makefile $(INCLUDEDIR)/ptal.h hpoj.h hpoj-tables.h sane.h saneopts.h
|
|
|
46 |
|
|
|
47 |
-CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
|
|
|
48 |
+CFLAGS=@CFLAGS@ @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@
|
|
|
49 |
|
|
|
50 |
%.shared.o: %.c $(INCLUDES)
|
|
|
51 |
$(CC) $(CFLAGS) -fPIC -c -o $@ $<
|
|
|
52 |
@@ -31,6 +31,6 @@
|
|
|
53 |
rm -f $(DISTCLEANS)
|
|
|
54 |
|
|
|
55 |
$(SOLONG): $(SOCOMPS)
|
|
|
56 |
- $(CC) $(CFLAGS) -lptal -lhpojip -shared -Wl,-soname,$(SOSHORT) -o $(SOLONG) $(SOCOMPS) -lc
|
|
|
57 |
+ $(CC) $(CFLAGS) -lptal -lhpojip -shared -Wl,-h,$(SOSHORT) -o $(SOLONG) $(SOCOMPS) -lc
|
|
|
58 |
ln -sf $(SOLONG) $(SOSHORT)
|
|
|
59 |
ln -sf $(SOLONG) $(SONOVER)
|
|
|
60 |
--- hpoj-0.91/mlcd/Makefile.in.orig 2007-06-08 10:32:52.469475000 -0400
|
|
|
61 |
+++ hpoj-0.91/mlcd/Makefile.in 2007-06-08 10:34:01.335670000 -0400
|
|
|
62 |
@@ -19,14 +19,14 @@
|
|
|
63 |
transport/ExMlcTransport.h \
|
|
|
64 |
|
|
|
65 |
PWD=$(shell pwd)
|
|
|
66 |
-CFLAGS=-I$(PWD) -I$(PWD)/transport -O -g -Wall -DEX_TRANSPORT_UNIX_PORT -DPAR_PLATFORM_@PAR_PLATFORM@ -DUSB_PLATFORM_@USB_PLATFORM@ -DJD_DEBUGLITE @MLCD_CFLAGS@ @VAR_RUN_PREFIX_CFLAGS@
|
|
|
67 |
+CFLAGS=-I$(PWD) -I$(PWD)/transport -DEX_TRANSPORT_UNIX_PORT -DPAR_PLATFORM_@PAR_PLATFORM@ -DUSB_PLATFORM_@USB_PLATFORM@ -DJD_DEBUGLITE @MLCD_CFLAGS@ @VAR_RUN_PREFIX_CFLAGS@
|
|
|
68 |
LFLAGS=@MLCD_LFLAGS@
|
|
|
69 |
|
|
|
70 |
%.o : %.cpp $(INCLUDES)
|
|
|
71 |
- $(CXX) $(CFLAGS) -c -o $@ $<
|
|
|
72 |
+ $(CXX) @CXXFLAGS@ $(CFLAGS) -c -o $@ $<
|
|
|
73 |
|
|
|
74 |
%.o : %.c $(INCLUDES)
|
|
|
75 |
- $(CC) $(CFLAGS) -c -o $@ $<
|
|
|
76 |
+ $(CC) @CFLAGS@ $(CFLAGS) -c -o $@ $<
|
|
|
77 |
|
|
|
78 |
all: $(GOAL)
|
|
|
79 |
|
|
|
80 |
--- hpoj-0.91/apps/cmdline/Makefile.in.orig 2007-06-08 10:41:59.469854000 -0400
|
|
|
81 |
+++ hpoj-0.91/apps/cmdline/Makefile.in 2007-06-08 10:42:35.072950000 -0400
|
|
|
82 |
@@ -5,15 +5,15 @@
|
|
|
83 |
DISTCLEANS=Makefile
|
|
|
84 |
INCLUDES=Makefile ../../include/ptal.h ../../include/hpojip.h
|
|
|
85 |
|
|
|
86 |
-CFLAGS=-O -Wall -g @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@
|
|
|
87 |
+CFLAGS=@CFLAGS@ @DEFINES_CMDLINE@ @INCLUDE_CMDLINE@ @LIBRARY_CMDLINE@ @VAR_RUN_PREFIX_CFLAGS@
|
|
|
88 |
|
|
|
89 |
all: $(GOALS)
|
|
|
90 |
|
|
|
91 |
ptal-%: ptal-%.c $(INCLUDES)
|
|
|
92 |
- $(CC) $(CFLAGS) -lptal -o $@ $<
|
|
|
93 |
+ $(CC) $(CFLAGS) -lptal -o $@ $< -lsocket -lnsl
|
|
|
94 |
|
|
|
95 |
hpojip-%: hpojip-%.c $(INCLUDES)
|
|
|
96 |
- $(CC) $(CFLAGS) -lhpojip -o $@ $<
|
|
|
97 |
+ $(CC) $(CFLAGS) -lhpojip -o $@ $< -lsocket -lnsl
|
|
|
98 |
|
|
|
99 |
ptal-print: ptal-connect
|
|
|
100 |
ln -sf ptal-connect ptal-print
|
|
|
101 |
--- hpoj-0.91/mlcd/Makefile.in.orig 2007-06-08 10:42:53.045248000 -0400
|
|
|
102 |
+++ hpoj-0.91/mlcd/Makefile.in 2007-06-08 10:41:05.256539000 -0400
|
|
|
103 |
@@ -31,7 +31,7 @@
|
|
|
104 |
all: $(GOAL)
|
|
|
105 |
|
|
|
106 |
$(GOAL): $(OBJS)
|
|
|
107 |
- $(CXX) $(LFLAGS) -o $(GOAL) $(OBJS)
|
|
|
108 |
+ $(CXX) $(LFLAGS) -o $(GOAL) $(OBJS) -lsocket -lnsl
|
|
|
109 |
|
|
|
110 |
clean:
|
|
|
111 |
rm -f $(OBJS) $(GOAL)
|