From dd0f23940fc88a826a094d3ec16271d094e8466f Mon Sep 17 00:00:00 2001 From: deuce <> Date: Fri, 21 Jan 2005 03:07:04 +0000 Subject: [PATCH] Makefile works now. --- src/tone/Makefile | 7 +++---- src/tone/objects.mk | 1 + src/tone/targets.mk | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/tone/Makefile b/src/tone/Makefile index 304e3e0d08..865e3635c8 100644 --- a/src/tone/Makefile +++ b/src/tone/Makefile @@ -34,12 +34,11 @@ ############################################################################# SRC_ROOT = .. -!include $(SRC_ROOT)/build/Common.bmake +!include $(SRC_ROOT)\build\Common.bmake LDFLAGS = $(LDFLAGS) $(XPDEV_LDFLAGS) CFLAGS = $(CFLAGS) $(XPDEV_CFLAGS) -LDLIBS = $(LDLIBS) -lm -lxpdev -$(TONE): $(OBJODIR)$(DIRSEP)tone$(OFILE) +$(TONE): $(OBJS) @echo Creating $@ - $(QUIET)$(CC) $(CFLAGS) $(CCFLAGS) $(LDFLAGS) -e$@ $** $(LDLIBS) + $(QUIET)$(CC) $(CFLAGS) $(LDFLAGS) -e$@ $** $(XPDEV_LIBS) diff --git a/src/tone/objects.mk b/src/tone/objects.mk index 18c5cfa264..ed27f10a62 100644 --- a/src/tone/objects.mk +++ b/src/tone/objects.mk @@ -8,3 +8,4 @@ OBJS = \ $(OBJODIR)$(DIRSEP)tone$(OFILE) + diff --git a/src/tone/targets.mk b/src/tone/targets.mk index ddf317cc04..0c65c4b6e8 100644 --- a/src/tone/targets.mk +++ b/src/tone/targets.mk @@ -1,3 +1,4 @@ TONE = $(EXEODIR)$(DIRSEP)tone$(EXEFILE) -all: $(EXEODIR) $(OBJODIR) $(TONE) +all: $(XPDEV_LIB) $(EXEODIR) $(OBJODIR) $(TONE) + -- GitLab