From 68eddcfcbb94171212fa7702b411aa28ff3454eb Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Fri, 14 Aug 2015 22:42:48 +1000 Subject: [PATCH] Fixed a makefile --- makefile | 1 - network/packet_types/makefile | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/makefile b/makefile index c5ac867..12d7825 100644 --- a/makefile +++ b/makefile @@ -8,7 +8,6 @@ all: $(OUTDIR) $(MAKE) -C graphics $(MAKE) -C map $(MAKE) -C network - $(MAKE) -C ui $(MAKE) -C utilities debug: export CXXFLAGS+=-g diff --git a/network/packet_types/makefile b/network/packet_types/makefile index 3526e73..e6aff0a 100644 --- a/network/packet_types/makefile +++ b/network/packet_types/makefile @@ -10,13 +10,9 @@ CXXSRC=$(wildcard *.cpp) OBJDIR=obj OBJ+=$(addprefix $(OBJDIR)/,$(CXXSRC:.cpp=.o)) -#output -OUTDIR=../$(OUTDIR) -OUT=../$(OUT) - #targets all: $(OBJ) $(OUT) - ar -crs $(OUT) $(OBJ) + ar -crs ../$(OUT) $(OBJ) $(OBJ): | $(OBJDIR)