[zaptel-commits] sruffell: branch 1.4 r4101 - /branches/1.4/kernel/xpp/utils/

[SVN commits to the Zaptel project]

Author: sruffell
Date: Thu Mar 27 17:08:24 2008
New Revision: 4101

URL: http://svn.digium.com/view/zaptel?view=rev&rev=4101
Log:
No need to make the wctdm_fxomodes.h file anymore, since it would be the same
as the fxo_modes.h file.

Modified:
    branches/1.4/kernel/xpp/utils/Makefile
    branches/1.4/kernel/xpp/utils/print_modes.c

Modified: branches/1.4/kernel/xpp/utils/Makefile
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/utils/Makefile?view=diff&rev=4101&r1=4100&r2=4101
==============================================================================
--- branches/1.4/kernel/xpp/utils/Makefile (original)
+++ branches/1.4/kernel/xpp/utils/Makefile Thu Mar 27 17:08:24 2008
@@ -48,8 +48,6 @@
 # Let's make a poor man detection of libusb
 PBX_LIBUSB	= $(shell if [ -r /usr/include/usb.h ]; then echo 1; else echo 0; fi)
 endif
-
-WCTDM=$(ZAP_KERNEL)/fxo_modes.h
 
 CFLAGS		= -g -Wall $(EXTRA_CFLAGS)
 
@@ -126,11 +124,8 @@
 test_parse: test_parse.o libhexfile.a
 	$(CC) -L. -o $@ $@.o $(EXTRA_LIBS) -lhexfile -lusb
 
-print_modes: print_modes.c wctdm_fxomodes.h
-	$(HOSTCC) -o $@ $(CFLAGS) $<
-
-wctdm_fxomodes.h: $(WCTDM)
-	perl -n -e 'print if (/^static struct fxo_mode {$$/ .. /};$$/)' $(WCTDM) >$@
+print_modes: print_modes.c $(ZAP_KERNEL)/fxo_modes.h
+	$(HOSTCC) -I$(ZAP_KERNEL) -o $@ $(CFLAGS) $<
 
 init_fxo_modes: print_modes
 	./$< >$@

Modified: branches/1.4/kernel/xpp/utils/print_modes.c
URL: http://svn.digium.com/view/zaptel/branches/1.4/kernel/xpp/utils/print_modes.c?view=diff&rev=4101&r1=4100&r2=4101
==============================================================================
--- branches/1.4/kernel/xpp/utils/print_modes.c (original)
+++ branches/1.4/kernel/xpp/utils/print_modes.c Thu Mar 27 17:08:24 2008
@@ -1,6 +1,6 @@
 #include <stdio.h>
 
-#include "wctdm_fxomodes.h"
+#include "fxo_modes.h"
 
 int main() {
 	size_t i;