You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
gentoo-overlay/games-simulation/searchandrescue/files/searchandrescue-1.3.0-build...

69 lines
2.4 KiB

diff -ru searchandrescue_1.3.0.orig/sar/makefile_append.ini searchandrescue_1.3.0/sar/makefile_append.ini
--- searchandrescue_1.3.0.orig/sar/makefile_append.ini 2004-08-05 18:34:15.000000000 -0400
+++ searchandrescue_1.3.0/sar/makefile_append.ini 2011-04-06 18:12:26.599574441 -0400
@@ -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."
diff -ru searchandrescue_1.3.0.orig/sar/platforms.ini searchandrescue_1.3.0/sar/platforms.ini
--- searchandrescue_1.3.0.orig/sar/platforms.ini 2011-03-08 19:29:52.000000000 -0500
+++ searchandrescue_1.3.0/sar/platforms.ini 2011-04-06 18:12:11.277632730 -0400
@@ -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