svn commit: r237524 - in user/adrian/ath_radar_stuff: lib/libradarpkt src/pktlog src/qt-hpktlog src/qt-pktlog

Adrian Chadd adrian at FreeBSD.org
Sun Jun 24 07:10:35 UTC 2012 

Author: adrian
Date: Sun Jun 24 07:10:34 2012
New Revision: 237524
URL: http://svn.freebsd.org/changeset/base/237524

Log:
  Now that the ptach is in -HEAD, we need to define -DATH_ENABLE_RADIOTAP_VENDOR_EXT
  or the radiotap vendor extensions won't show up.
  
  It's dirty, but unfortunately that's how it has to be at the present
  moment.

Modified:
  user/adrian/ath_radar_stuff/lib/libradarpkt/Makefile
  user/adrian/ath_radar_stuff/src/pktlog/Makefile
  user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile
  user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro
  user/adrian/ath_radar_stuff/src/qt-pktlog/Makefile
  user/adrian/ath_radar_stuff/src/qt-pktlog/qt-pktlog.pro

Modified: user/adrian/ath_radar_stuff/lib/libradarpkt/Makefile
==============================================================================
--- user/adrian/ath_radar_stuff/lib/libradarpkt/Makefile	Sun Jun 24 07:03:22 2012	(r237523)
+++ user/adrian/ath_radar_stuff/lib/libradarpkt/Makefile	Sun Jun 24 07:10:34 2012	(r237524)
@@ -1,7 +1,13 @@
 LIB=	radarpkt
 
 SRCS=	ar9280_radar.c ar5416_radar.c
-CFLAGS+=	-I/home/adrian/work/freebsd/ath/head/src/sys -g -ggdb
+
+# Define 'ATH_ENABLE_RADIOTAP_VENDOR_EXT' as it's not enabled by default
+# in the configuration file.  Ideally this would just fake an "opt_ath.h"
+# and include it, but I digress..
+
+CFLAGS+=	-I/home/adrian/work/freebsd/ath/head/src/sys -g -ggdb	\
+	    -DATH_ENABLE_RADIOTAP_VENDOR_EXT -g -ggdb
 
 NO_MAN=	1
 

Modified: user/adrian/ath_radar_stuff/src/pktlog/Makefile
==============================================================================
--- user/adrian/ath_radar_stuff/src/pktlog/Makefile	Sun Jun 24 07:03:22 2012	(r237523)
+++ user/adrian/ath_radar_stuff/src/pktlog/Makefile	Sun Jun 24 07:10:34 2012	(r237524)
@@ -4,7 +4,8 @@ X_INCS=	-I../../lib/
 X_LIBS=	-L../../lib/libradarpkt/
 
 SRCS=	main.c
-CFLAGS+=	-I/home/adrian/work/freebsd/ath/head/src/sys $(X_INCS) -g -ggdb
+CFLAGS+=	-I/home/adrian/work/freebsd/ath/head/src/sys $(X_INCS) -g -ggdb \
+	-DATH_ENABLE_RADIOTAP_VENDOR_EXT
 LDADD+=	$(X_LIBS) -lpcap -lradarpkt
 
 NO_MAN=	1

Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile
==============================================================================
--- user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile	Sun Jun 24 07:03:22 2012	(r237523)
+++ user/adrian/ath_radar_stuff/src/qt-hpktlog/Makefile	Sun Jun 24 07:10:34 2012	(r237524)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: qt-hpktlog
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Fri Jun 22 14:06:40 2012
+# Generated by qmake (2.01a) (Qt 4.7.4) on: Sun Jun 24 00:10:19 2012
 # Project:  qt-hpktlog.pro
 # Template: app
 # Command: /usr/local/bin/qmake-qt4 -o Makefile qt-hpktlog.pro
@@ -11,8 +11,8 @@
 CC            = gcc
 CXX           = g++
 DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -Wall -W $(DEFINES)
-CXXFLAGS      = -pipe -O2 -Wall -W $(DEFINES)
+CFLAGS        = -g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT -O2 -Wall -W $(DEFINES)
+CXXFLAGS      = -g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT -O2 -Wall -W $(DEFINES)
 INCPATH       = -I/usr/local/share/qt4/mkspecs/freebsd-g++ -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4/QtGui -I/usr/local/include/qt4 -I. -I../../lib -I/usr/local/include/qt4 -I/usr/local/include/qwt6 -I. -I/usr/local/include/qt4 -I/usr/local/include
 LINK          = g++
 LFLAGS        = -Wl,-O1 -pthread -Wl,-rpath,/usr/local/lib/qt4

Modified: user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro
==============================================================================
--- user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro	Sun Jun 24 07:03:22 2012	(r237523)
+++ user/adrian/ath_radar_stuff/src/qt-hpktlog/qt-hpktlog.pro	Sun Jun 24 07:10:34 2012	(r237524)
@@ -8,6 +8,9 @@ DEPENDPATH += .
 INCLUDEPATH += . ../../lib/ /usr/local/include/qt4 /usr/local/include/qwt6
 LIBS+=	-L../../lib/libradarpkt -lpcap -lradarpkt -lqwt6
 
+QMAKE_CFLAGS=	-g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT
+QMAKE_CXXFLAGS=	-g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT
+
 # Input
 HEADERS += MainApp.h PktSource.h
 # FORMS += PlotWindow.ui MainWindow.ui

Modified: user/adrian/ath_radar_stuff/src/qt-pktlog/Makefile
==============================================================================
--- user/adrian/ath_radar_stuff/src/qt-pktlog/Makefile	Sun Jun 24 07:03:22 2012	(r237523)
+++ user/adrian/ath_radar_stuff/src/qt-pktlog/Makefile	Sun Jun 24 07:10:34 2012	(r237524)
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: qt-pktlog
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Jun 20 22:53:05 2012
+# Generated by qmake (2.01a) (Qt 4.7.4) on: Sun Jun 24 00:09:46 2012
 # Project:  qt-pktlog.pro
 # Template: app
 # Command: /usr/local/bin/qmake-qt4 -o Makefile qt-pktlog.pro
@@ -11,8 +11,8 @@
 CC            = gcc
 CXX           = g++
 DEFINES       = -DQT_NO_DEBUG -DQT_GUI_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -Wall -W $(DEFINES)
-CXXFLAGS      = -pipe -O2 -Wall -W $(DEFINES)
+CFLAGS        = -g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT -O2 -Wall -W $(DEFINES)
+CXXFLAGS      = -g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT -O2 -Wall -W $(DEFINES)
 INCPATH       = -I/usr/local/share/qt4/mkspecs/freebsd-g++ -I. -I/usr/local/include/qt4/QtCore -I/usr/local/include/qt4/QtGui -I/usr/local/include/qt4 -I. -I../../lib -I/usr/local/include/qt4 -I/usr/local/include/qwt6 -I. -I/usr/local/include/qt4 -I/usr/local/include
 LINK          = g++
 LFLAGS        = -Wl,-O1 -pthread -Wl,-rpath,/usr/local/lib/qt4

Modified: user/adrian/ath_radar_stuff/src/qt-pktlog/qt-pktlog.pro
==============================================================================
--- user/adrian/ath_radar_stuff/src/qt-pktlog/qt-pktlog.pro	Sun Jun 24 07:03:22 2012	(r237523)
+++ user/adrian/ath_radar_stuff/src/qt-pktlog/qt-pktlog.pro	Sun Jun 24 07:10:34 2012	(r237524)
@@ -2,6 +2,9 @@
 # Automatically generated by qmake (2.01a) Tue Feb 14 14:16:07 2012
 ######################################################################
 
+QMAKE_CFLAGS=	-g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT
+QMAKE_CXXFLAGS=	-g -ggdb -DATH_ENABLE_RADIOTAP_VENDOR_EXT
+
 TEMPLATE = app
 TARGET = 
 DEPENDPATH += .

More information about the svn-src-user mailing list