lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-29 15:41:13 +03:00
Code Activity

tried to fix mingw build, no success, it still works halfway

Browse Source
This commit is contained in:
Igor Zlatkovic
2003-12-11 18:52:07 +00:00
parent ad6e1edbe2
commit f8c283c3af
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Dec 11 19:50:41 CET 2003 Igor Zlatkovic <igor@zlatkovic.com>
* win32/Makefile.mingw win32/configure.js: tried to fix mingw
build, no success, it still works halfway.
Thu Dec 11 16:33:41 CET 2003 Igor Zlatkovic <igor@zlatkovic.com> Thu Dec 11 16:33:41 CET 2003 Igor Zlatkovic <igor@zlatkovic.com>
* win32/Makefile.* win32/configure.js libxslt/xsltexports.h * win32/Makefile.* win32/configure.js libxslt/xsltexports.h

34
win32/Makefile.mingw
View File

@ -19,9 +19,9 @@ include $(AUTOCONF)
# ---------------------------------------------------------------- # ----------------------------------------------------------------
BASEDIR = .. BASEDIR = ..
XSLT_SRCDIR = $(BASEDIR)/libxslt XSLT_SRCDIR = $(BASEDIR)\libxslt
EXSLT_SRCDIR = $(BASEDIR)/libexslt EXSLT_SRCDIR = $(BASEDIR)\libexslt
UTILS_SRCDIR = $(BASEDIR)/xsltproc UTILS_SRCDIR = $(BASEDIR)\xsltproc
BINDIR = bin.mingw BINDIR = bin.mingw
# Names of various input and output components. # Names of various input and output components.
@ -88,7 +88,7 @@ XSLT_OBJS = $(XSLT_INTDIR)/attributes.o\
$(XSLT_INTDIR)/variables.o\ $(XSLT_INTDIR)/variables.o\
$(XSLT_INTDIR)/xslt.o\ $(XSLT_INTDIR)/xslt.o\
$(XSLT_INTDIR)/xsltutils.o $(XSLT_INTDIR)/xsltutils.o
XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR)/,$(XSLT_SRCDIR)/,$(XSLT_OBJS))) XSLT_SRCS = $(subst .o,.c,$(subst $(XSLT_INTDIR),$(XSLT_SRCDIR),$(XSLT_OBJS)))
# Static libxslt object files. # Static libxslt object files.
XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\ XSLT_OBJS_A = $(XSLT_INTDIR_A)/attributes.o\
@ -138,13 +138,13 @@ UTILS = $(BINDIR)/xsltproc.exe
all : dep libxslt libxslta libexslt libexslta utils all : dep libxslt libxslta libexslt libexslta utils
libxslt : $(BINDIR)/$(XSLT_SO) libxslt : $(BINDIR)\$(XSLT_SO)
libxslta : $(BINDIR)/$(XSLT_A) libxslta : $(BINDIR)\$(XSLT_A)
libexslt : $(BINDIR)/$(EXSLT_SO) libexslt : $(BINDIR)\$(EXSLT_SO)
libexslta : $(BINDIR)/$(EXSLT_A) libexslta : $(BINDIR)\$(EXSLT_A)
utils : $(UTILS) utils : $(UTILS)
@ -155,11 +155,13 @@ clean :
cmd.exe /C if exist $(EXSLT_INTDIR_A) rmdir /S /Q $(EXSLT_INTDIR_A) cmd.exe /C if exist $(EXSLT_INTDIR_A) rmdir /S /Q $(EXSLT_INTDIR_A)
cmd.exe /C if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR) cmd.exe /C if exist $(UTILS_INTDIR) rmdir /S /Q $(UTILS_INTDIR)
cmd.exe /C if exist $(BINDIR) rmdir /S /Q $(BINDIR) cmd.exe /C if exist $(BINDIR) rmdir /S /Q $(BINDIR)
cmd.exe /C if exist depends.mingw del depends.mingw
rebuild : clean all rebuild : clean all
distclean : clean distclean : clean
cmd.exe /C if exist config.* del config.* cmd.exe /C if exist config.* del config.*
cmd.exe /C if exist depends.* del depends.*
cmd.exe /C if exist Makefile del Makefile cmd.exe /C if exist Makefile del Makefile
install : all install : all
@ -185,10 +187,10 @@ bindist : all
$(MAKE) PREFIX=$(BDPREFIX) BINPREFIX=$(BDPREFIX)/util install $(MAKE) PREFIX=$(BDPREFIX) BINPREFIX=$(BDPREFIX)/util install
cscript //NoLogo configure.js genreadme $(XSLT_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt cscript //NoLogo configure.js genreadme $(XSLT_BASENAME) $(BDVERSION) $(BDPREFIX)\readme.txt
# Creates the dependency files # Creates the dependency files
dep : dep :
$(CC) $(CFLAGS) -M $(XSLT_SRCS) > depends.mingw $(CC) $(subst \,/,$(CFLAGS)) -MM $(subst \,/,$(XSLT_SRCS)) $(subst \,/,$(EXSLT_SRCS)) > depends.mingw
$(CC) $(CFLAGS) -M $(EXSLT_SRCS) >> depends.mingw
# Makes the compiler output directory. # Makes the compiler output directory.
@ -206,7 +208,7 @@ $(XSLT_INTDIR_A) :
# An implicit rule for libxslt compilation. # An implicit rule for libxslt compilation.
$(XSLT_INTDIR)/%.o : $(XSLT_SRCDIR)/%.c $(XSLT_INTDIR)/%.o : $(XSLT_SRCDIR)/%.c
$(CC) $(CFLAGS) -o $@ -c $< $(CC) $(CFLAGS) -c -o $@ $<
# An implicit rule for static libxslt compilation. # An implicit rule for static libxslt compilation.
$(XSLT_INTDIR_A)/%.o : $(XSLT_SRCDIR)/%.c $(XSLT_INTDIR_A)/%.o : $(XSLT_SRCDIR)/%.c
@ -222,11 +224,11 @@ $(XSLT_OBJS_A) : $(XSLT_INTDIR_A)
XSLTSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(XSLT_IMP) XSLTSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(XSLT_IMP)
XSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION) XSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBXSLT_MAJOR_VERSION)
XSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION) XSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBXSLT_MINOR_VERSION)
$(BINDIR)/$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS) $(BINDIR)\$(XSLT_SO) : $(BINDIR) $(XSLT_OBJS)
$(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -llibxml2 $(LD) $(XSLTSO_LDFLAGS) -o $(BINDIR)/$(XSLT_SO) $(XSLT_OBJS) $(LIBS) -llibxml2
# Creates the libxslt archive. # Creates the libxslt archive.
$(BINDIR)/$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A) $(BINDIR)\$(XSLT_A) : $(BINDIR) $(XSLT_OBJS_A)
$(AR) $(ARFLAGS) $(BINDIR)/$(XSLT_A) $(XSLT_OBJS_A) $(AR) $(ARFLAGS) $(BINDIR)/$(XSLT_A) $(XSLT_OBJS_A)
@ -257,11 +259,11 @@ $(EXSLT_OBJS_A) : $(EXSLT_INTDIR_A)
EXSLTSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(EXSLT_IMP) EXSLTSO_LDFLAGS = $(LDFLAGS) -shared -Wl,--dll -Wl,--out-implib,$(BINDIR)/$(EXSLT_IMP)
EXSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBEXSLT_MAJOR_VERSION) EXSLTSO_LDFLAGS += -Wl,--major-image-version,$(LIBEXSLT_MAJOR_VERSION)
EXSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBEXSLT_MINOR_VERSION) EXSLTSO_LDFLAGS += -Wl,--minor-image-version,$(LIBEXSLT_MINOR_VERSION)
$(BINDIR)/$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt $(BINDIR)\$(EXSLT_SO) : $(BINDIR) $(EXSLT_OBJS) libxslt
$(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_BASENAME) -llibxml2 $(LD) $(EXSLTSO_LDFLAGS) -o $(BINDIR)/$(EXSLT_SO) $(EXSLT_OBJS) $(LIBS) -l$(XSLT_BASENAME) -llibxml2
# Creates the libexslt archive. # Creates the libexslt archive.
$(BINDIR)/$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta $(BINDIR)\$(EXSLT_A) : $(BINDIR) $(EXSLT_OBJS_A) libxslta
$(AR) $(ARFLAGS) $(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A) $(AR) $(ARFLAGS) $(BINDIR)\$(EXSLT_A) $(EXSLT_OBJS_A)
@ -291,6 +293,6 @@ endif
$(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libxslta libexslt libexslta $(UTILS) : $(UTILS_INTDIR) $(BINDIR) libxslt libxslta libexslt libexslta
# Source dependencies # Source dependencies, just how?
#-include depends.mingw #-include depends.mingw

4
win32/configure.js
View File

@ -362,8 +362,8 @@ if (error != 0) {
WScript.Quit(error); WScript.Quit(error);
} }
dirSep = "\\"; dirSep = "\\";
if (compiler == "mingw") //if (compiler == "mingw")
dirSep = "/"; // dirSep = "/";
if (buildBinPrefix == "") if (buildBinPrefix == "")
buildBinPrefix = "$(PREFIX)" + dirSep + "bin"; buildBinPrefix = "$(PREFIX)" + dirSep + "bin";
if (buildIncPrefix == "") if (buildIncPrefix == "")