summaryrefslogtreecommitdiff
path: root/ham/fl_logbook/patches/patch-aa
blob: 44a05c0e31f0a0247c07ee623804ea597b9b864c (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
$NetBSD: patch-aa,v 1.1.1.1 2007/01/21 16:49:23 obache Exp $

--- Makefile.orig	2006-11-21 14:10:53.000000000 +0000
+++ Makefile
@@ -10,7 +10,6 @@ else
 endif
 
 PROJECT = fl_logbook
-CC = "/usr/bin/g++"
 
 ifeq ($(CFG),Debug)
   OBJ_DIR = Debug
@@ -19,9 +18,9 @@ ifeq ($(CFG),Debug)
   C_INCLUDE_DIRS = -I"src" 
   C_PREPROC = 
   CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -ggdb2 -O0 -fno-rtti -fexceptions 
-  LIB_DIRS = -L"src/lib" -L"../../../../../usr/local/lib" 
+  LIB_DIRS = -L"src/lib"
   LIBS = 
-  LDFLAGS = -pipe `fltk-config --ldstaticflags`
+  LDFLAGS = -pipe `fltk-config --ldflags`
 endif
 
 ifeq ($(CFG),Release)
@@ -31,9 +30,9 @@ ifeq ($(CFG),Release)
   C_INCLUDE_DIRS = -I"src" 
   C_PREPROC = 
   CFLAGS = -pipe `fltk-config --cxxflags` -Wno-deprecated -ffast-math -Wall -g0 -O2 -fno-rtti -fexceptions 
-  LIB_DIRS = -L"src/lib" -L"../../../../../usr/local/lib" 
+  LIB_DIRS = -L"src/lib"
   LIBS =
-  LDFLAGS = -pipe -s `fltk-config --ldstaticflags`
+  LDFLAGS = -pipe -s `fltk-config --ldflags`
 endif
 
 SRC_OBJS = \
@@ -52,12 +51,12 @@ SRC_OBJS = \
 
 define build_target
 @echo Linking...
-@$(CC) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
+@$(CXX) -o "$(OUTPUT_DIR)/$(TARGET)" $(SRC_OBJS) $(LIB_DIRS) $(LIBS) $(LDFLAGS)
 endef
 
 define compile_source
 @echo Compiling $<
-@$(CC) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
+@$(CXX) $(CFLAGS) $(C_PREPROC) $(C_INCLUDE_DIRS) -c "$<" -o "$@"
 endef
 
 .PHONY: print_header directories