gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2026-01-29 11:35:47 +01:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Now that the builtin XPM loading is separated from the saving code, the
use of the conditionals provided by autotools provides a better result
as it avoids unnecessary compilation.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2013-11-08 18:50:01 +01:00
committed by Carlos R. Mafra
parent aa99207ab4
commit 3b2362662e
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
wrlib/Makefile.am
View File

@@ -34,7 +34,6 @@ libwraster_la_SOURCES = \
scale.c \ scale.c \
rotate.c \ rotate.c \
convolve.c \ convolve.c \
nxpm.c \
save_xpm.c \ save_xpm.c \
xutil.c \ xutil.c \
ppm.c ppm.c
@@ -57,6 +56,8 @@ endif
if USE_XPM if USE_XPM
libwraster_la_SOURCES += xpm.c libwraster_la_SOURCES += xpm.c
else
libwraster_la_SOURCES += nxpm.c
endif endif
LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//` LTCOMPILE2=`echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//`

3
wrlib/nxpm.c
View File

@@ -52,7 +52,6 @@
#define LINEWIDTH 64 #define LINEWIDTH 64
#ifndef USE_XPM
static void free_color_symbol_table(unsigned char *color_table[], static void free_color_symbol_table(unsigned char *color_table[],
unsigned short *symbol_table) unsigned short *symbol_table)
@@ -444,5 +443,3 @@ RImage *RLoadXPM(RContext * context, const char *file)
RReleaseImage(image); RReleaseImage(image);
return NULL; return NULL;
} }
#endif