gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-20 12:58:08 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: Use a Conditional for GIF in the makefile instead of #if in source

Browse Source 
The use of the conditionals provided by autotools provides a better result
as they avoid unnecessary compilation.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
Signed-off-by: Carlos R. Mafra <crmafra@gmail.com>
This commit is contained in:
Christophe CURIS
2013-11-03 13:08:10 +01:00
committed by Carlos R. Mafra
parent f892ce4d37
commit 7831acebe3
3 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
m4/wm_imgfmt_check.m4
View File

@@ -64,7 +64,8 @@ AS_IF([test "x$enable_gif" = "xno"],
AC_DEFINE_UNQUOTED([USE_GIF], AC_DEFINE_UNQUOTED([USE_GIF],
[1], [1],
[defined when valid GIF library with header was found])]) [defined when valid GIF library with header was found])])
])dnl ])
AM_CONDITIONAL([USE_GIF], [test "x$enable_gif" != "xno"])dnl
]) dnl AC_DEFUN ]) dnl AC_DEFUN

6
wrlib/Makefile.am
View File

@@ -40,9 +40,11 @@ libwraster_la_SOURCES = \
ppm.c \ ppm.c \
png.c \ png.c \
jpeg.c \ jpeg.c \
tiff.c \ tiff.c
gif.c
if USE_GIF
libwraster_la_SOURCES += gif.c
endif
LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//` LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//`
COMPILE2=`echo $(COMPILE) | sed -e s/-fomit-frame-pointer//` COMPILE2=`echo $(COMPILE) | sed -e s/-fomit-frame-pointer//`

4
wrlib/gif.c
View File

@@ -22,8 +22,6 @@
#include <config.h> #include <config.h>
#ifdef USE_GIF
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@@ -209,5 +207,3 @@ RImage *RLoadGIF(const char *file, int index)
return image; return image;
} }
#endif /* USE_GIF */