applied sin's patch and prepared new release
This commit is contained in:
		
							parent
							
								
									4339b507af
								
							
						
					
					
						commit
						44ce161c13
					
				
							
								
								
									
										3
									
								
								LICENSE
								
								
								
								
							
							
						
						
									
										3
									
								
								LICENSE
								
								
								
								
							| 
						 | 
					@ -1,6 +1,7 @@
 | 
				
			||||||
MIT/X Consortium License
 | 
					MIT/X Consortium License
 | 
				
			||||||
 | 
					
 | 
				
			||||||
© 2006-2013 Anselm R Garbe <anselm@garbe.us>
 | 
					© 2014 Dimitris Papastamos <sin@2f30.org>
 | 
				
			||||||
 | 
					© 2006-2014 Anselm R Garbe <anselm@garbe.us>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
Permission is hereby granted, free of charge, to any person obtaining a
 | 
					Permission is hereby granted, free of charge, to any person obtaining a
 | 
				
			||||||
copy of this software and associated documentation files (the "Software"),
 | 
					copy of this software and associated documentation files (the "Software"),
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
							
								
								
									
										8
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										8
									
								
								Makefile
								
								
								
								
							| 
						 | 
					@ -18,7 +18,11 @@ options:
 | 
				
			||||||
	@echo CC $<
 | 
						@echo CC $<
 | 
				
			||||||
	@${CC} -c ${CFLAGS} $<
 | 
						@${CC} -c ${CFLAGS} $<
 | 
				
			||||||
 | 
					
 | 
				
			||||||
${OBJ}: config.mk
 | 
					${OBJ}: config.h config.mk
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					config.h:
 | 
				
			||||||
 | 
						@echo creating $@ from config.def.h
 | 
				
			||||||
 | 
						@cp config.def.h $@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
slock: ${OBJ}
 | 
					slock: ${OBJ}
 | 
				
			||||||
	@echo CC -o $@
 | 
						@echo CC -o $@
 | 
				
			||||||
| 
						 | 
					@ -31,7 +35,7 @@ clean:
 | 
				
			||||||
dist: clean
 | 
					dist: clean
 | 
				
			||||||
	@echo creating dist tarball
 | 
						@echo creating dist tarball
 | 
				
			||||||
	@mkdir -p slock-${VERSION}
 | 
						@mkdir -p slock-${VERSION}
 | 
				
			||||||
	@cp -R LICENSE Makefile README config.mk ${SRC} slock-${VERSION}
 | 
						@cp -R LICENSE Makefile README config.def.h config.mk ${SRC} slock-${VERSION}
 | 
				
			||||||
	@tar -cf slock-${VERSION}.tar slock-${VERSION}
 | 
						@tar -cf slock-${VERSION}.tar slock-${VERSION}
 | 
				
			||||||
	@gzip slock-${VERSION}.tar
 | 
						@gzip slock-${VERSION}.tar
 | 
				
			||||||
	@rm -rf slock-${VERSION}
 | 
						@rm -rf slock-${VERSION}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,2 @@
 | 
				
			||||||
 | 
					#define COLOR1 "black"
 | 
				
			||||||
 | 
					#define COLOR2 "#005577"
 | 
				
			||||||
| 
						 | 
					@ -14,7 +14,7 @@ INCS = -I. -I/usr/include -I${X11INC}
 | 
				
			||||||
LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
 | 
					LIBS = -L/usr/lib -lc -lcrypt -L${X11LIB} -lX11 -lXext
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# flags
 | 
					# flags
 | 
				
			||||||
CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H -DCOLOR1=\"black\" -DCOLOR2=\"\#005577\"
 | 
					CPPFLAGS = -DVERSION=\"${VERSION}\" -DHAVE_SHADOW_H
 | 
				
			||||||
CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 | 
					CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 | 
				
			||||||
LDFLAGS = -s ${LIBS}
 | 
					LDFLAGS = -s ${LIBS}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue