viking

webkit based web browser for Enlightenment
Log | Files | Refs | LICENSE

commit 6c3c2d807699f5fff6af4f305155e07dbe041d10
parent 00672422502db01176a248945ff07ba5487bc632
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Wed, 19 Sep 2012 17:27:40 -0600

jsmn: promote to root directory.

Diffstat:
MMakefile | 4++--
Rjsmn/jsmn.c -> jsmn.c | 0
Rjsmn/jsmn.h -> jsmn.h | 0
Djsmn/Makefile | 26--------------------------
Mutilities.c | 2+-
5 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile @@ -1,7 +1,7 @@ TARGET = viking # Objectfiles, needed for $(TARGET) -OBJ = main.o utilities.o commands.o +OBJ = main.o utilities.o commands.o jsmn.o # Manpages MAN1 = evi2.1 MAN5 = evirc.5 @@ -18,7 +18,7 @@ INSTALL = $(BINDIR)/$(TARGET) $(MANINSTALL) V_DEBUG = 1 CFLAGS += `pkg-config --cflags $(LIBS)` -LDFLAGS += `pkg-config --libs $(LIBS)` -Ljsmn -ljsmn +LDFLAGS += `pkg-config --libs $(LIBS)` # TA: This is a pretty stringent list of warnings to bail on! ifeq ($(V_DEBUG),1) diff --git a/jsmn/jsmn.c b/jsmn.c diff --git a/jsmn/jsmn.h b/jsmn.h diff --git a/jsmn/Makefile b/jsmn/Makefile @@ -1,26 +0,0 @@ -# You can put your build options here --include config.mk - -all: libjsmn.a - -libjsmn.a: jsmn.o - $(AR) rc $@ $^ - -%.o: %.c jsmn.h - $(CC) -c $(CFLAGS) $< -o $@ - -test: jsmn_test - ./jsmn_test - -jsmn_test: jsmn_test.o - $(CC) -L. -ljsmn $< -o $@ - -jsmn_test.o: jsmn_test.c libjsmn.a - -clean: - rm -f jsmn.o jsmn_test.o - rm -f jsmn_test - rm -f libjsmn.a - -.PHONY: all clean test - diff --git a/utilities.c b/utilities.c @@ -24,7 +24,7 @@ #include "commands.h" #include "keymap.h" -#include "jsmn/jsmn.h" +#include "jsmn.h" /* these all need to go */ extern Eina_Bool complete_case_sensitive;