diff options
| author | Jakob Bornecrantz <jakob@vmware.com> | 2009-02-20 00:22:07 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <jakob@vmware.com> | 2009-02-20 10:22:11 +0000 |
| commit | 2734b8079dd0cc3d0a275f2a415dd5c828fd4697 (patch) | |
| tree | f4dcd07b06e4544def1c567f3981a9fbf4324e9b /src | |
| parent | d9602e5144bc76b9791fa3382ca38c880df96198 (diff) | |
nouveau: Use new makefile template for drm common
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/Makefile | 14 | ||||
| -rw-r--r-- | src/gallium/winsys/drm/nouveau/common/Makefile.template | 59 |
2 files changed, 7 insertions, 66 deletions
diff --git a/src/gallium/winsys/drm/nouveau/common/Makefile b/src/gallium/winsys/drm/nouveau/common/Makefile index c6dd6dd7f9..f675f7caf1 100644 --- a/src/gallium/winsys/drm/nouveau/common/Makefile +++ b/src/gallium/winsys/drm/nouveau/common/Makefile @@ -11,12 +11,12 @@ C_SOURCES = \ nouveau_winsys_pipe.c \ nouveau_winsys_softpipe.c -include ./Makefile.template +LIBRARY_INCLUDES = $(shell pkg-config libdrm libdrm_nouveau --cflags-only-I) -DRIVER_DEFINES = $(shell pkg-config libdrm --cflags \ - && pkg-config libdrm --atleast-version=2.3.1 \ - && pkg-config libdrm_nouveau --exact-version=0.5 \ - && pkg-config libdrm_nouveau --cflags \ - && echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP") -symlinks: +LIBRARY_DEFINES = $(shell pkg-config libdrm --cflags-only-other \ + && pkg-config libdrm --atleast-version=2.3.1 \ + && pkg-config libdrm_nouveau --exact-version=0.5 \ + && pkg-config libdrm_nouveau --cflags-only-other \ + && echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP") +include ../../../../Makefile.template diff --git a/src/gallium/winsys/drm/nouveau/common/Makefile.template b/src/gallium/winsys/drm/nouveau/common/Makefile.template deleted file mode 100644 index f0d098bb1c..0000000000 --- a/src/gallium/winsys/drm/nouveau/common/Makefile.template +++ /dev/null @@ -1,59 +0,0 @@ -# -*-makefile-*- - -COMMON_SOURCES = - -OBJECTS = $(C_SOURCES:.c=.o) \ - $(CPP_SOURCES:.cpp=.o) \ - $(ASM_SOURCES:.S=.o) - - -### Include directories -INCLUDES = \ - -I. \ - -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/include \ - $(DRIVER_INCLUDES) - - -##### RULES ##### - -.c.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - -.cpp.o: - $(CXX) -c $(INCLUDES) $(CXXFLAGS) $(DRIVER_DEFINES) $< -o $@ - -.S.o: - $(CC) -c $(INCLUDES) $(CFLAGS) $(DRIVER_DEFINES) $< -o $@ - - -##### TARGETS ##### - -default: depend symlinks lib$(LIBNAME).a - - -lib$(LIBNAME).a: $(OBJECTS) Makefile Makefile.template - $(TOP)/bin/mklib -o $(LIBNAME) -static $(OBJECTS) $(DRIVER_LIBS) - - -depend: $(C_SOURCES) $(CPP_SOURCES) $(ASM_SOURCES) $(SYMLINKS) - rm -f depend - touch depend - $(MKDEP) $(MKDEP_OPTIONS) $(DRIVER_DEFINES) $(INCLUDES) $(C_SOURCES) $(CPP_SOURCES) \ - $(ASM_SOURCES) 2> /dev/null - - -# Emacs tags -tags: - etags `find . -name \*.[ch]` `find ../include` - - -# Remove .o and backup files -clean:: - -rm -f *.o */*.o *~ *.so *~ server/*.o $(SYMLINKS) - -rm -f depend depend.bak - - -include depend |