Skip to content

Commit

Permalink
Fix makefile concerning the setup
Browse files Browse the repository at this point in the history
  • Loading branch information
szapp committed Oct 22, 2019
1 parent 88ee783 commit cfc77ed
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ else ifeq ($(shell uname), Linux)
SCRIPTEXT := .sh
endif

# Meta data
META := metadata

# Include meta data
include $(META)
export VERSION=$(VBASE).$(VMAJOR).$(VMINOR)
Expand Down Expand Up @@ -50,9 +53,6 @@ FLAGS_A := -f win32 $(FLAGS_C)
FLAGS_L := /dll /entry DllMain /largeaddressaware /nxcompat /dynamicbase /ni
FLAGS_RC := /ni

# Meta data
META := metadata

# TARGET
TARGET := $(BUILDDIR)Ninja$(DLLEXT)
OBJ := $(BINDIR)Ninja$(OBJEXT)
Expand All @@ -67,7 +67,7 @@ WRAPPER_OBJ := $(BINDIR)BugslayerUtil$(OBJEXT)
WRAPPER_SRC := $(DLLDIR)BugslayerUtil$(ASMEXT)

# SETUP
SETUP := $(BUILDDIR)Ninja-$(VERSION)$(EXE)
SETUP := $(BUILDDIR)Ninja-$(VERSION)$(EXEEXT)
SETUPSCR := $(SETUPDIR)Ninja$(NSIEXT)

# System dependencies
Expand Down Expand Up @@ -175,10 +175,6 @@ EXEC := $(EXEC_BASE:%=$(EXECDIR)%$(ASMEXT))
DATA := $(DATA_BASE:%=$(DATADIR)%$(ASMEXT))


# Include meta data (re-include for environment variables)
include $(META)
export VERSION=$(VBASE).$(VMAJOR).$(VMINOR)

# Phony rules
all : $(SETUP)

Expand Down

0 comments on commit cfc77ed

Please sign in to comment.