Merge remote branch 'jeremyhu/master'
This commit is contained in:
		
						commit
						6a6a041c2d
					
				| 
						 | 
					@ -70,4 +70,4 @@ endif
 | 
				
			||||||
dix.c:
 | 
					dix.c:
 | 
				
			||||||
	touch $@
 | 
						touch $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
CLEANFILES = dix.c
 | 
					CLEANFILES = dix.c Xserver-dtrace.h
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -20,7 +20,7 @@ Xfake_LDADD = 						\
 | 
				
			||||||
	libfake.la					\
 | 
						libfake.la					\
 | 
				
			||||||
	@KDRIVE_LIBS@
 | 
						@KDRIVE_LIBS@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -Wl,-undefined=InitExtensions
 | 
					Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Xfake_DEPENDENCIES =	\
 | 
					Xfake_DEPENDENCIES =	\
 | 
				
			||||||
	libfake.la					\
 | 
						libfake.la					\
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue