viking

commit a6873c4e31db120f5bba92b42985090f651349cd
parent edc43785525594f39492f66fbec1133055ec4fc8
Author: Kyle Milz <kmilz@ucalgary.ca>
Date:   Tue, 25 Sep 2012 13:06:40 -0600

move all source files to src/

Diffstat:
M
Makefile
 | 
81
+++----------------------------------------------------------------------------
C
Makefile -> src/Makefile
 | 
0

R
callbacks.c -> src/callbacks.c
 | 
0

R
callbacks.h -> src/callbacks.h
 | 
0

R
commands.c -> src/commands.c
 | 
0

R
commands.h -> src/commands.h
 | 
0

R
hinting.js -> src/hinting.js
 | 
0

R
js-merge-helper.pl -> src/js-merge-helper.pl
 | 
0

R
jsmn.c -> src/jsmn.c
 | 
0

R
jsmn.h -> src/jsmn.h
 | 
0

R
keymap.h -> src/keymap.h
 | 
0

R
main.c -> src/main.c
 | 
0

R
main.h -> src/main.h
 | 
0

R
utilities.c -> src/utilities.c
 | 
0

R
utilities.h -> src/utilities.h
 | 
0

R
viking.h -> src/viking.h
 | 
0

R
viking_state.c -> src/viking_state.c
 | 
0

R
viking_state.h -> src/viking_state.h
 | 
0

18 files changed, 3 insertions(+), 78 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,81 +1,6 @@
-TARGET = viking
 
-# Objectfiles, needed for $(TARGET)
-OBJ = main.o utilities.o commands.o jsmn.o viking_state.o callbacks.o
-# Manpages
-MAN1 = evi2.1
-MAN5 = evirc.5
-# Used libraries to get needed CFLAGS and LDFLAGS form pkg-config
-LIBS = elementary ewebkit
-# Files to removo by clean target
-CLEAN = $(TARGET) $(OBJ) $(DEPS) javascript.h
-# Files to install by install target or remove by uninstall target
-MANINSTALL = $(addprefix $(MANDIR)/man1/,$(MAN1)) \
-             $(addprefix $(MANDIR)/man5/,$(MAN5))
-INSTALL = $(BINDIR)/$(TARGET) $(MANINSTALL)
+all:
+	cd src; make
 
-# DEBUG build?  Off by default
-V_DEBUG = 1
-
-CFLAGS += `pkg-config --cflags $(LIBS)`
-LDFLAGS += `pkg-config --libs $(LIBS)`
-
-# TA:  This is a pretty stringent list of warnings to bail on!
-ifeq ($(V_DEBUG),1)
-CFLAGS += -g -ggdb -Wstrict-prototypes
-CFLAGS += -Wno-long-long -Wall -Wmissing-declarations
-endif
-
-PREFIX ?= /usr/local
-BINDIR ?= $(PREFIX)/bin
-MANDIR ?= $(PREFIX)/share/man
-# Mode bits for normal not executable files
-FMOD ?= 0644
-# Mode bits for directories
-DMOD ?= 0755
-# Mode bits for executables
-EXECMOD ?= 0755
-# Destination directory to install files
-DESTDIR ?= /
-
-# auto garerated dependancies for object files
-DEPS = $(OBJ:%.o=%.d)
-
-all: $(TARGET)
-
--include $(DEPS)
-
-main.o: javascript.h
-javascript.h: hinting.js
-	perl ./js-merge-helper.pl
-
-$(TARGET): $(OBJ)
-	$(CC) $^ $(LDFLAGS) -o $@
-
-.PHONY: clean install uninstall
 clean:
-	-rm -f $(CLEAN)
-install: $(addprefix $(DESTDIR)/,$(INSTALL))
-uninstall:
-	rm -f $(addprefix $(DESTDIR)/,$(INSTALL))
-
-# pattern rule to inslall executabels
-$(DESTDIR)/$(BINDIR)/%: ./%
-	-[ -e '$(@D)' ] || mkdir -p '$(@D)' && chmod $(DMOD) '$(@D)'
-	cp -f '$<' '$@'
-	-strip -s '$@'
-	chmod $(EXECMOD) '$@'
-
-# pattern rules to install manpages
-$(DESTDIR)/$(MANDIR)/man1/%: ./%
-	-[ -e '$(@D)' ] || mkdir -p '$(@D)' && chmod $(DMOD) '$(@D)'
-	cp -f '$<' '$@'
-	chmod $(FMOD) '$@'
-
-$(DESTDIR)/$(MANDIR)/man5/%: ./%
-	-[ -e '$(@D)' ] || mkdir -p '$(@D)' && chmod $(DMOD) '$(@D)'
-	cp -f '$<' '$@'
-	chmod $(FMOD) '$@'
-
-%.o: %.c
-	$(CC) -MMD -D_GNU_SOURCE -c $(CFLAGS) $< -o $@ 
+	cd src; make clean
diff --git a/Makefile b/src/Makefile
diff --git a/callbacks.c b/src/callbacks.c
diff --git a/callbacks.h b/src/callbacks.h
diff --git a/commands.c b/src/commands.c
diff --git a/commands.h b/src/commands.h
diff --git a/hinting.js b/src/hinting.js
diff --git a/js-merge-helper.pl b/src/js-merge-helper.pl
diff --git a/jsmn.c b/src/jsmn.c
diff --git a/jsmn.h b/src/jsmn.h
diff --git a/keymap.h b/src/keymap.h
diff --git a/main.c b/src/main.c
diff --git a/main.h b/src/main.h
diff --git a/utilities.c b/src/utilities.c
diff --git a/utilities.h b/src/utilities.h
diff --git a/viking.h b/src/viking.h
diff --git a/viking_state.c b/src/viking_state.c
diff --git a/viking_state.h b/src/viking_state.h