From 3f212ea971dea919bf4eeb3fccea8c71981c985e Mon Sep 17 00:00:00 2001 From: Jeff Hartmann Date: Wed, 15 Mar 2000 18:42:10 +0000 Subject: Fixed bug in makefile from last commit --- linux/Makefile.linux | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 2f22fe64..79b30d7d 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -113,20 +113,7 @@ ifeq ($(AGP),0) AGP := $(shell gcc -E -nostdinc -I$(TREE) picker.c 2>/dev/null \ | grep -s 'AGP_MODULE = ' | cut -d' ' -f3) endif -all::;@echo KERNEL HEADERS IN $(TREE): SMP=${SMP} MODVERSIONS=${MODVERSIONS} \ - AGP=${AGP} -all:: $(LIBS) $(MODS) -endif -# **** End of SMP/MODVERSIONS detection - -# **** Handle SMP/MODVERSIONS -ifeq ($(SMP),1) -MODCFLAGS += -D__SMP__ -endif -ifeq ($(MODVERSIONS),1) -MODCFLAGS += -DMODVERSIONS -include $(TREE)/linux/modversions.h -endif ifeq ($(AGP),1) MODCFLAGS += -DDRM_AGP DRMOBJS += agpsupport.o @@ -139,7 +126,21 @@ I810OBJS= i810_drv.o i810_dma.o i810_bufs.o i810_context.o I810HEADERS= i810_drv.h i810_drm_public.h $(DRMHEADERS) endif +all::;@echo KERNEL HEADERS IN $(TREE): SMP=${SMP} MODVERSIONS=${MODVERSIONS} \ + AGP=${AGP} all:: $(LIBS) $(MODS) $(PROGS) +endif + +# **** End of SMP/MODVERSIONS detection + +# **** Handle SMP/MODVERSIONS +ifeq ($(SMP),1) +MODCFLAGS += -D__SMP__ +endif +ifeq ($(MODVERSIONS),1) +MODCFLAGS += -DMODVERSIONS -include $(TREE)/linux/modversions.h +endif + # **** End of configuration -- cgit v1.2.3