From 4db7d75bc14d8b93a247ede2a3ac7a7190d31d5e Mon Sep 17 00:00:00 2001
From: kramm <kramm>
Date: Tue, 6 May 2003 11:42:17 +0000
Subject: [PATCH] moved q.h/q.c to ../lib
---
src/Makefile.in | 10 ++++------
src/parser.lex | 2 +-
src/swfc.c | 2 +-
3 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/Makefile.in b/src/Makefile.in
index d3dadf5..191c13f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -23,12 +23,10 @@ swfstrings.o: swfstrings.c
$(C) swfstrings.c -o $@
jpeg2swf.o: jpeg2swf.c
$(C) jpeg2swf.c -o $@
-swfc.o: swfc.c parser.h q.h
+swfc.o: swfc.c parser.h ../lib/q.h
$(C) swfc.c -o $@
-parser.o: parser.yy.c parser.h q.h
+parser.o: parser.yy.c parser.h ../lib/q.h
$(C) parser.yy.c -o $@
-q.o: q.c q.h
- $(C) q.c -o $@
# TODO: include the following rule only if lex is available
parser.yy.c: parser.lex
@@ -55,8 +53,8 @@ swfstrings: swfstrings.o
jpeg2swf: jpeg2swf.o
$(L) jpeg2swf.o -o $@ ../lib/librfxswf.a $(LIBS)
$(STRIP) jpeg2swf
-swfc: parser.o swfc.o q.o wav.o
- $(L) parser.o swfc.o q.o wav.o -o $@ ../lib/librfxswf.a $(LIBS)
+swfc: parser.o swfc.o ../lib/q.o wav.o
+ $(L) parser.o swfc.o ../lib/q.o wav.o -o $@ ../lib/librfxswf.a $(LIBS)
$(STRIP) swfc
install:
diff --git a/src/parser.lex b/src/parser.lex
index 4ccf2c0..d5d81d6 100644
--- a/src/parser.lex
+++ b/src/parser.lex
@@ -3,7 +3,7 @@
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
-#include "q.h"
+#include "../lib/q.h"
#include "parser.h"
//RVALUE {NUMBER}|{PERCENT}|{NAME}|\"{STRING}\"|{DIM}
diff --git a/src/swfc.c b/src/swfc.c
index aa8fe6b..bdb631a 100644
--- a/src/swfc.c
+++ b/src/swfc.c
@@ -20,7 +20,7 @@
#include "../lib/rfxswf.h"
#include "../lib/log.h"
#include "../lib/args.h"
-#include "q.h"
+#include "../lib/q.h"
#include "parser.h"
#include "wav.h"
--
1.7.10.4