forgot "shell" in $(shell...

This commit is contained in:
Albert Cahalan 2008-05-25 17:49:32 +00:00
parent 42d1e6b33a
commit ac23d23a1c
2 changed files with 7 additions and 5 deletions

View file

@ -155,9 +155,9 @@ SDL_LIBS+=$(SDL_MIXER_LIB) $(SDL_PANGO_LIB)
SVG_LIB:=$(shell pkg-config --libs librsvg-2.0 cairo)
# lots of -I things, so really should be SVG_CPPFLAGS
SVG_CFLAGS:=$(pkg-config --cflags librsvg-2.0 cairo)
SVG_CFLAGS:=$(shell pkg-config --cflags librsvg-2.0 cairo)
SDL_CFLAGS:=$(shell sdl-config --cflags) $(SVG_CFLAGS)
SDL_CFLAGS:=$(shell sdl-config --cflags)
# SVG support (via Cairo) enabled by __SVG
@ -959,7 +959,7 @@ obj/tuxpaint.o: src/tuxpaint.c \
Makefile
@echo
@echo "...Compiling Tux Paint from source..."
@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) \
$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(SVG_CFLAGS) $(MOUSE_CFLAGS) $(DEFS) \
-c src/tuxpaint.c -o obj/tuxpaint.o
obj/i18n.o: src/i18n.c src/i18n.h src/debug.h

View file

@ -381,8 +381,10 @@ extern WrapperData macosx;
#else
#include "rsvg.h"
#include "rsvg-cairo.h"
#include <librsvg/rsvg.h>
#include <librsvg/rsvg-cairo.h>
//#include "rsvg.h"
//#include "rsvg-cairo.h"
#if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
#error "---------------------------------------------------"
#error "If you installed libRSVG from packages, be sure"