parser modules now compiling and linking with main build process

git-svn-id: svn://anubis/fart/trunk@80 7f9b0f55-74a9-4bce-be96-3c2cd072584d
This commit is contained in:
Josh Holtrop 2009-02-04 18:50:15 +00:00
parent 1fe251f27d
commit dab2381fba
2 changed files with 4 additions and 3 deletions

View File

@ -16,12 +16,14 @@ $(TARGET):
make -C util make -C util
make -C shapes make -C shapes
make -C main make -C main
$(CXX) -o $@ main/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) make -C parser
$(CXX) -o $@ main/*.o util/*.o shapes/*.o parser/*.o $(CXXFLAGS) $(LDFLAGS)
make -C test make -C test
$(CXX) -o tests test/*.o util/*.o shapes/*.o $(CXXFLAGS) $(LDFLAGS) $(CXX) -o tests test/*.o util/*.o shapes/*.o parser/*.o $(CXXFLAGS) $(LDFLAGS)
clean: clean:
make -C test clean make -C test clean
make -C parser clean
make -C main clean make -C main clean
make -C shapes clean make -C shapes clean
make -C util clean make -C util clean

View File

@ -6,7 +6,6 @@ PARSER := parser
COBJS := lex.yy.o COBJS := lex.yy.o
CXXOBJS := $(PARSER).tab.o CXXOBJS := $(PARSER).tab.o
CXXOBJS += ASTNode.o
all: $(COBJS) $(CXXOBJS) all: $(COBJS) $(CXXOBJS)