blob: 40428bade2d73fbe6b92b2a5ead1340a1088d125 (
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
|
--- searchandrescue_1.3.0.orig/sar/makefile_append.ini
+++ searchandrescue_1.3.0/sar/makefile_append.ini
@@ -3,7 +3,7 @@
# C++ flags:
-CPPFLAGS = -D__cplusplus -Dc_plusplus
+CPPFLAGS += -D__cplusplus -Dc_plusplus
# Source files list:
@@ -16,14 +16,12 @@
OBJ_CPP = $(SRC_CPP:.cpp=.o)
.c.o:
@echo "Compiling module $*.o"
- @$(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
+ $(CC) -c $*.c $(INC_DIRS) $(CFLAGS)
.cpp.o:
@echo "Compiling module $*.o"
- @$(CPP) -c $*.cpp $(INC_DIRS) $(CFLAGS) $(CPPFLAGS)
+ $(CPP) -c $*.cpp $(INC_DIRS) $(CPPFLAGS)
# Programs
-LS = ls
-LSFLAGS = -s -h -c --color=auto
RM = rm
RMFLAGS = -f
@@ -32,9 +30,8 @@
modules: $(OBJ_C) $(OBJ_CPP)
@echo -n "Linking modules..."
- @$(CPP) $(OBJ_C) $(OBJ_CPP) -o $(BIN) $(LIBS) $(LIB_DIRS)
+ $(CPP) $(OBJ_C) $(OBJ_CPP) $(LDFLAGS) -o $(BIN) $(LIBS) $(LIB_DIRS)
@echo -n " "
- @-$(LS) $(LSFLAGS) $(BIN)
prebuild:
@echo "Building program \"$(BIN)\"..."
@@ -54,5 +51,5 @@
clean:
@echo "Cleaning program \"$(BIN)\"..."
@echo "Deleting all intermediate files..."
- @$(RM) $(RMFLAGS) a.out core *.o $(BIN)
+ $(RM) $(RMFLAGS) a.out core *.o $(BIN)
@echo "Clean done."
--- searchandrescue_1.3.0.orig/sar/platforms.ini
+++ searchandrescue_1.3.0/sar/platforms.ini
@@ -102,7 +102,7 @@
FeatureDepend = xf86vidmode-lib
DependType = Library
MustExist = Yes
- DependPath = libXxf86vm.a
+ DependPath = libXxf86vm.so
DependGrepString = XF86VidModeQueryExtension
FeatureDepend = xf86vidmode-devel
DependType = Header
@@ -223,7 +223,7 @@
FeatureDepend = xf86vidmode-lib
DependType = Library
MustExist = Yes
- DependPath = libXxf86vm.a
+ DependPath = libXxf86vm.so
DependGrepString = XF86VidModeQueryExtension
FeatureDepend = xf86vidmode-devel
DependType = Header
|
GitWeb
