re-orged linux Makefile a little

git-svn-id: https://svn.code.sf.net/p/freetel/code@746 01035d8c-6547-0410-b346-abe4f91aad63

diff --git a/fdmdv2/src/Makefile.linux b/fdmdv2/src/Makefile.linux
index 279a17a659b23b9353c07c7441346c830aaf0bf9..5a4975234d1fe89b60ce956b02a965cc16c0d50a 100644 (file)
--- a/fdmdv2/src/Makefile.linux
+++ b/fdmdv2/src/Makefile.linux
@@ -2,14 +2,17 @@
 # David Rowe 10 Oct 2012
 # test Makefile to help David R get up to speed
 
-WX_CONFIG=/home/david/Desktop/wxWidgets-2.9.4/build_gtk/wx-config
+WX_GTK_PATH=/home/david/Desktop/wxWidgets-2.9.4/build_gtk
+CODEC2_PATH=/home/david/codec2-dev
+
+WX_CONFIG=$(WX_GTK_PATH)/wx-config
 WX_CPPFLAGS = $(shell $(WX_CONFIG) --cxxflags)
 WX_LIBS = $(shell $(WX_CONFIG) --libs core, base, aui)
-CODEC2_INC=-I/home/david/codec2-dev/src
-CODEC2_LIB=/home/david/codec2-dev/src/.libs/libcodec2.a
+CODEC2_INC=-I$(CODEC2_PATH)/src
+CODEC2_LIB=$(CODEC2_PATH)/src/.libs/libcodec2.a
+
 CPP_FLAGS = $(WX_CPPFLAGS) $(CODEC2_INC) -I../extern/include -g -Wall
 LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm /usr/lib/libportaudiocpp.so.0 -lpthread 
-#LIBS = $(WX_LIBS) $(CODEC2_LIB) -lm  -lpthread 
 
 OBJS = topFrame.o \
 fdmdv2_main.o \
@@ -26,12 +29,6 @@ dlg_options.o
 
 all: fdmdv2
 
-hworld.o: /home/david/tmp/hworld.cpp 
-       g++ $(CPP_FLAGS) -c $< -o $@
-
-hworld: hworld.o
-       g++ -o hworld hworld.o $(CPP_FLAGS) $(LIBS)
-
 fdmdv2: $(OBJS)
        g++ -o fdmdv2 $(OBJS) $(CPP_FLAGS) $(LIBS)