diff options
Diffstat (limited to 'linux/Makefile.linux')
| -rw-r--r-- | linux/Makefile.linux | 72 |
1 files changed, 32 insertions, 40 deletions
diff --git a/linux/Makefile.linux b/linux/Makefile.linux index 26eed9a5..d022557d 100644 --- a/linux/Makefile.linux +++ b/linux/Makefile.linux @@ -47,38 +47,34 @@ # **** End of SMP/MODVERSIONS detection -#MODS= gamma.o tdfx.o -MODS= tdfx.o -LIBS= +MODS = gamma.o tdfx.o +LIBS = -#DRMOBJS= init.o memory.o proc.o auth.o context.o drawable.o bufs.o \ -# lists.o lock.o ioctl.o fops.o vm.o dma.o ctxbitmap.o -DRMOBS= -DRMTEMPLATES= drm_init.h drm_memory.h drm_proc.h drm_auth.h drm_context.h \ - drm_drawable.h drm_bufs.h drm_lists.h drm_lock.h drm_ioctl.h \ - drm_fops.h drm_vm.h drm_dma.h drm_stub.h -DRMHEADERS= drm.h drmP.h compat-pre24.h +DRMTEMPLATES = drm_auth.h drm_bufs.h drm_context.h drm_dma.h drm_drawable.h \ + drm_drv.h drm_fops.h drm_init.h drm_ioctl.h drm_lists.h \ + drm_lock.h drm_memory.h drm_proc.h drm_stub.h drm_vm.h +DRMHEADERS = drm.h drmP.h compat-pre24.h -#GAMMAOBJS= gamma_drv.o gamma_drm.o gamma_dma.o gamma_context.o -#GAMMAHEADERS= gamma_drv.h $(DRMHEADERS) $(DRMTEMPLATES) +GAMMAOBJS = gamma_drv.o gamma_dma.o +GAMMAHEADERS = gamma_drv.h $(DRMHEADERS) $(DRMTEMPLATES) -TDFXOBJS= tdfx_drv.o -TDFXHEADERS= tdfx.h $(DRMHEADERS) +TDFXOBJS = tdfx_drv.o +TDFXHEADERS = tdfx.h $(DRMHEADERS) -INC= /usr/include +INC = /usr/include -CFLAGS= -O2 $(WARNINGS) -WARNINGS= -Wall -Wwrite-strings -Wpointer-arith -Wcast-align \ +CFLAGS = -O2 $(WARNINGS) +WARNINGS = -Wall -Wwrite-strings -Wpointer-arith -Wcast-align \ -Wstrict-prototypes -Wnested-externs \ -Wpointer-arith # -Wshadow -Winline -- make output too noisy -MODCFLAGS= $(CFLAGS) -D__KERNEL__ -DMODULE -fomit-frame-pointer -PRGCFLAGS= $(CFLAGS) -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \ +MODCFLAGS = $(CFLAGS) -D__KERNEL__ -DMODULE -fomit-frame-pointer +PRGCFLAGS = $(CFLAGS) -g -ansi -pedantic -DPOSIX_C_SOURCE=199309L \ -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE \ -I../../../../../../include -I../../../../../../../../include \ -I../../../../../../../../programs/Xserver/hw/xfree86/common \ -I. -I../../.. -I../../../../../../../../lib/X11 -PRGLIBS= +PRGLIBS = # **** Start of SMP/MODVERSIONS detection @@ -134,7 +130,8 @@ endif ifeq ($(AGP),1) MODCFLAGS += -DCONFIG_AGP -DCONFIG_AGP_MODULE -#DRMOBJS += agpsupport.o +DRMTEMPLATES += drm_agpsupport.h +DRMHEADERS += agpsupport-pre24.h MODS += mga.o r128.o radeon.o ifeq ($(MACHINE),i386) MODS += i810.o @@ -144,17 +141,17 @@ MODS += i810.o endif -MGAOBJS= mga_drv.o mga_dma.o mga_state.o mga_warp.o -MGAHEADERS= mga.h mga_drv.h $(DRMHEADERS) $(DRMTEMPLATES) +MGAOBJS = mga_drv.o mga_dma.o mga_state.o mga_warp.o +MGAHEADERS = mga.h mga_drv.h mga_drm.h $(DRMHEADERS) $(DRMTEMPLATES) -I810OBJS= i810_drv.o i810_dma.o -I810HEADERS= i810.h i810_drv.h $(DRMHEADERS) $(DRMTEMPLATES) +I810OBJS = i810_drv.o i810_dma.o +I810HEADERS = i810.h i810_drv.h i810_drm.h $(DRMHEADERS) $(DRMTEMPLATES) -R128OBJS= r128_drv.o r128_cce.o r128_state.o -R128HEADERS= r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES) +R128OBJS = r128_drv.o r128_cce.o r128_state.o +R128HEADERS = r128.h r128_drv.h r128_drm.h $(DRMHEADERS) $(DRMTEMPLATES) -RADEONOBJS= radeon_drv.o radeon_cp.o radeon_state.o -RADEONHEADERS= radeon.h radeon_drv.h radeon_drm.h $(DRMHEADERS) \ +RADEONOBJS = radeon_drv.o radeon_cp.o radeon_state.o +RADEONHEADERS = radeon.h radeon_drv.h radeon_drm.h $(DRMHEADERS) \ $(DRMTEMPLATES) endif @@ -177,7 +174,7 @@ all::;@echo === SMP=${SMP} MODULES=${MODULES} MODVERSIONS=${MODVERSIONS} AGP=${A all::;@echo === kill_fasync has $(PARAMS) parameters all::;@echo === Compiling for machine $(MACHINE) all::;@echo === WARNING -all::;@echo === WARNING 2.4.0 kernels before test11 DONT WORK +all::;@echo === WARNING 2.4.0 kernels before 2.4.0-test11 DO NOT WORK all::;@echo === WARNING ifeq ($(MODULES),0) @@ -205,17 +202,13 @@ endif # **** End of configuration -libdrm.a: $(DRMOBJS) - -$(RM) -f $@ - $(AR) rcs $@ $(DRMOBJS) - dristat: dristat.c $(CC) $(PRGCFLAGS) $< -o $@ -#gamma_drv.o: gamma_drv.c -# $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ -#gamma.o: $(GAMMAOBJS) -# $(LD) -r $^ -o $@ +gamma_drv.o: gamma_drv.c + $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ +gamma.o: $(GAMMAOBJS) + $(LD) -r $^ -o $@ tdfx_drv.o: tdfx_drv.c $(CC) $(MODCFLAGS) -DEXPORT_SYMTAB -I$(TREE) -c $< -o $@ @@ -260,8 +253,7 @@ ChangeLog: %.o: %.c $(CC) $(MODCFLAGS) -I$(TREE) -c $< -o $@ -$(DRMOBJS): $(DRMHEADERS) -#$(GAMMAOBJS): $(GAMMAHEADERS) +$(GAMMAOBJS): $(GAMMAHEADERS) $(TDFXOBJS): $(TDFXHEADERS) ifeq ($(AGP),1) $(MGAOBJS): $(MGAHEADERS) |