f1d5a66c97
Based on PR 32278. FlLogbook is a amateur radio operator log book written using the Fast Light Toolkit.
51 lines
1.5 KiB
Text
51 lines
1.5 KiB
Text
$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
|