diff options
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/Amiga.mk | 4 | ||||
| -rw-r--r-- | mk/Posix.mk.in | 5 | ||||
| -rw-r--r-- | mk/VMS.mk | 10 | ||||
| -rw-r--r-- | mk/Windows32.mk | 6 | ||||
| -rw-r--r-- | mk/msdosdjgpp.mk | 4 |
5 files changed, 20 insertions, 9 deletions
diff --git a/mk/Amiga.mk b/mk/Amiga.mk index 61733a3c..79f9b6ae 100644 --- a/mk/Amiga.mk +++ b/mk/Amiga.mk @@ -32,7 +32,9 @@ LDFLAGS = prog_SOURCES += $(alloca_SOURCES) $(loadavg_SOURCES) $(glob_SOURCES) $(amiga_SOURCES) -extra_CPPFLAGS = IDir $(OUTDIR)src IDir $(SRCDIR)/src IDir $(SRCDIR)/glob +BUILT_SOURCES += $(lib)alloca.h $(lib)fnmatch.h $(lib)glob.h + +extra_CPPFLAGS = IDir $(OUTDIR)src IDir $(SRCDIR)/src IDir $(OUTDIR)lib IDir $(SRCDIR)/lib C_SOURCE = OUTPUT_OPTION = diff --git a/mk/Posix.mk.in b/mk/Posix.mk.in index 73bb645a..88ac3096 100644 --- a/mk/Posix.mk.in +++ b/mk/Posix.mk.in @@ -22,6 +22,7 @@ prog_SOURCES += $(posix_SOURCES) -extra_CPPFLAGS += @GUILE_CFLAGS@ @GLOBINC@ +extra_CPPFLAGS += @GUILE_CFLAGS@ extra_LDFLAGS += @AM_LDFLAGS@ -LDLIBS += @GUILE_LIBS@ @LIBOBJS@ @GETLOADAVG_LIBS@ @GLOBLIB@ @ALLOCA@ @LIBINTL@ @LIBS@ +LDLIBS += @LIBOBJS@ @gl_LIBOBS@ @ALLOCA@ +LDLIBS += @GUILE_LIBS@ @GETLOADAVG_LIBS@ @LIBINTL@ @LIBS@ @@ -19,7 +19,7 @@ # this program. If not, see <http://www.gnu.org/licenses/>. src = [.src] -glob = [.glob] +lib = [.lib] SRCDIR = [] OBJEXT = .obj @@ -46,7 +46,7 @@ endif extra_CPPFLAGS = /define=($(subst $s,$c,$(patsubst %,"%",$(defs)))) -cinclude = /nested=none/include=($(src),$(glob)) +cinclude = /nested=none/include=($(src),$(lib)) ifeq ($(CC),cc) cprefix = /prefix=(all,except=(glob,globfree)) cwarn = /standard=relaxed/warn=(disable=questcompare) @@ -71,8 +71,14 @@ endif # uncomment this #ALLOCA = $(alloca_SOURCES) +# If your system doesn't have alloca.h, or the one provided is bad, +# uncomment this +#BUILT_SOURCES += $(lib)alloca.h + prog_SOURCES += $(ALLOCA) $(glob_SOURCES) $(vms_SOURCES) +BUILT_SOURCES += $(lib)fnmatch.h $(lib)glob.h + COMPILE.cmd = $(CC) $(extra_CFLAGS)$(CFLAGS)/obj=$@ $(extra_CPPFLAGS)$(CPPFLAGS) $< LINK.cmd = $(LD)$(extra_LDFLAGS)$(LDFLAGS)/exe=$@ $(subst $s,$c,$^)$(LDLIBS) diff --git a/mk/Windows32.mk b/mk/Windows32.mk index d658c465..1cbe80b7 100644 --- a/mk/Windows32.mk +++ b/mk/Windows32.mk @@ -27,6 +27,8 @@ TOOLCHAIN = msvc prog_SOURCES += $(loadavg_SOURCES) $(glob_SOURCES) $(w32_SOURCES) +BUILT_SOURCES += $(lib)fnmatch.h $(lib)glob.h + w32_LIBS = kernel32 user32 gdi32 winspool comdlg32 advapi32 shell32 ole32 \ oleaut32 uuid odbc32 odbccp32 @@ -39,7 +41,7 @@ msvc_CC = cl.exe msvc_LD = link.exe msvc_CPPFLAGS = /DHAVE_CONFIG_H /DWINDOWS32 /DWIN32 /D_CONSOLE -msvc_CPPFLAGS += /I$(OUTDIR)src /I$(SRCDIR)/src /I$(SRCDIR)/glob /I$(SRCDIR)/src/w32/include +msvc_CPPFLAGS += /I$(OUTDIR)src /I$(SRCDIR)/src /I$(SRCDIR)/src/w32/include /I$(OUTDIR)lib /I$(SRCDIR)/lib msvc_CFLAGS = /nologo /MT /W4 /EHsc msvc_CFLAGS += /FR$(OUTDIR) /Fp$(BASE_PROG).pch /Fd$(BASE_PROG).pdb @@ -68,7 +70,7 @@ gcc_LD = $(gcc_CC) release_gcc_OUTDIR = ./GccRel/ debug_gcc_OUTDIR = ./GccDebug/ -gcc_CPPFLAGS = -DHAVE_CONFIG_H -I$(OUTDIR)src -I$(SRCDIR)/src -I$(SRCDIR)/glob -I$(SRCDIR)/src/w32/include +gcc_CPPFLAGS = -DHAVE_CONFIG_H -I$(OUTDIR)src -I$(SRCDIR)/src -I$(SRCDIR)/src/w32/include -I$(OUTDIR)lib -I$(SRCDIR)/lib gcc_CFLAGS = -mthreads -Wall -std=gnu99 -gdwarf-2 -g3 gcc_LDFLAGS = -mthreads -gdwarf-2 -g3 gcc_LDLIBS = $(addprefix -l,$(w32_libs)) diff --git a/mk/msdosdjgpp.mk b/mk/msdosdjgpp.mk index cec58ef9..2da5bc50 100644 --- a/mk/msdosdjgpp.mk +++ b/mk/msdosdjgpp.mk @@ -25,12 +25,12 @@ CC = gcc prog_SOURCES += $(loadavg_SOURCES) $(glob_SOURCES) +BUILT_SOURCES += $(lib)fnmatch.h $(lib)glob.h + INCLUDEDIR = c:/djgpp/include LIBDIR = c:/djgpp/lib LOCALEDIR = c:/djgpp/share -extra_CPPFLAGS = -I$(SRCDIR)/glob - MKDIR = command.com /c mkdir MKDIR.cmd = $(MKDIR) $(subst /,\\,$@) |