File dahdi-kill-xpp_h.diff of Package dahdi-linux

File dahdi-kill-xpp_h.diff of Package dahdi-linux (Revision 25)

Currently displaying revision 25, show latest

From: Jan Engelhardt <jengelh@medozas.de>
Date: 2011-10-10 02:43:57.731063007 +0200
Upstream: tbd

build: fix mixing BUILT_SOURCES with normal SOURCES

In automake terminology, xpp_version.h would have to be declared as
BUILT_SOURCES, because .c files depend on a still-to-be-built file.
But since that does not exist in Kbuild (to my knowledge), do away
with xpp_version.h entirely and, in fact, replace it by something
much more simpler that I would also use with automake.

---
 drivers/dahdi/xpp/Kbuild  |   15 ++-------------
 drivers/dahdi/xpp/xdefs.h |    3 ---
 2 files changed, 2 insertions(+), 16 deletions(-)

Index: dahdi-linux-2.5.0.1/drivers/dahdi/xpp/Kbuild
===================================================================
--- dahdi-linux-2.5.0.1.orig/drivers/dahdi/xpp/Kbuild
+++ dahdi-linux-2.5.0.1/drivers/dahdi/xpp/Kbuild
@@ -3,7 +3,7 @@ EXTRA_CFLAGS	=	$(XPP_LOCAL_CFLAGS)	\
 			-DPOLL_DIGITAL_INPUTS	\
 			-DDEBUG_PCMTX		\
 			-DPROTOCOL_DEBUG	\
-			-g
+			-g -DXPP_VERSION=\"${XPP_VERSION_STR}\"
 			#
 
 WITH_BRISTUFF	:= $(shell grep -c '^[[:space:]]*\#[[:space:]]*define[[:space:]]\+CONFIG_DAHDI_BRI_DCHANS\>' $(src)/../../../include/dahdi/dahdi_config.h)
@@ -38,17 +38,6 @@ endif
 
 # Handle versioning
 XPP_VERSION_STR	?= $(shell if [ -r $(obj)/.version ]; then echo "\"`cat $(obj)/.version`\""; else echo '"Unknown"'; fi)
-clean-files	+= xpp_version.h
-
-$(obj)/card_fxs.o $(obj)/card_fxo.o $(obj)/card_bri.o $(obj)/card_pri.o $(obj)/xpp_usb.o $(obj)/xpp.o: $(obj)/xpp_version.h
-
-$(obj)/xpp_version.h: FORCE
-	@echo '  VERSION $@'
-	$(Q)echo '#define	XPP_VERSION	$(XPP_VERSION_STR)' > $@.tmp
-	$(Q)if cmp -s $@.tmp $@ ; then echo; else \
-		mv $@.tmp $@ ; \
-	fi
-	$(Q)rm -f $@.tmp
 
 # Validations:
 #  - Syntactic verification of perl scripts
@@ -69,7 +58,7 @@ FXO_MODES  = $(src)/../fxo_modes.h
 FXO_VERIFY = $(obj)/init_card_2_$(XPP_PROTOCOL_VERSION) -v $(obj)/init_fxo_modes
 
 hostprogs-y			:= print_fxo_modes
-always				:= $(xpp_verified) xpp_version.h
+always				:= $(xpp_verified)
 print_fxo_modes-objs		:= print_fxo_modes.o
 HOSTCFLAGS_print_fxo_modes.o	+= -include $(FXO_MODES)
 
Index: dahdi-linux-2.5.0.1/drivers/dahdi/xpp/xdefs.h
===================================================================
--- dahdi-linux-2.5.0.1.orig/drivers/dahdi/xpp/xdefs.h
+++ dahdi-linux-2.5.0.1/drivers/dahdi/xpp/xdefs.h
@@ -21,9 +21,6 @@
  * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  */
-
-#include "xpp_version.h"
-
 #ifdef	__KERNEL__
 
 #include <linux/kernel.h>