diff options
Diffstat (limited to 'buildtools/Makefile')
-rw-r--r-- | buildtools/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/buildtools/Makefile b/buildtools/Makefile index 8ea61abe..9c0ee778 100644 --- a/buildtools/Makefile +++ b/buildtools/Makefile @@ -4,7 +4,7 @@ ifeq ($(SRCDIR)x,x) endif SUBDIR = buildtools VPATH = .:$(SRCDIR)/$(SUBDIR) -include $(BUILDDIR)/Makefile.config +include $(BUILDDIR)/config.mk MERGE_OBJECTS = @@ -17,7 +17,7 @@ BINARIES = SCRIPTS = OMIT_BUILDTOOL_RULE = 1 -include $(SRCDIR)/Makefile.common +include $(SRCDIR)/common.mk ifdef DLLVER STRIP_DLL_VERSION=-DDLLVERSTR="\"$(DLLVER)\"" @@ -28,16 +28,16 @@ EXPLICIT=-DEXPLICIT endif libopt.o: libopt.c - $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) \ + $(CC_FOR_BUILD) -c -o $@ $(CFLAGS_FOR_BUILD) \ -DSHLIBPREFIXLIST="\"$(SHLIBPREFIXLIST)\"" \ $(STRIP_DLL_VERSION) $(EXPLICIT) $(CFLAGS_PERSONAL) $(CADD) \ - -o $@ $< + $< typegen.o endiangen.o:%.o:%.c - $(CC_FOR_BUILD) -c $(CFLAGS_FOR_BUILD) -o $@ $< + $(CC_FOR_BUILD) -c -o $@ $(CFLAGS_FOR_BUILD) $< $(PROGS):%:%.o - $(LD_FOR_BUILD) -o $@ $< + $(LD_FOR_BUILD) -o $@ $(LDFLAGS_FOR_BUILD) $< distclean clean: cleanlocal .PHONY: cleanlocal |