More portability fixes

diff --git a/Makefile b/Makefile
index 2c3bf9bfb0a15136728b8f3fc84a220764e99669..c9e8aaa4e15a0b134c61a2e71ef25572f71be43a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,32 +1,8 @@
-CC = @CC@
-prefix = @prefix@
-bindir = $(prefix)/bin
-mandir = $(prefix)/share/man
-libdir = $(prefix)/lib
-includedir = $(prefix)/include
-pkgconfigdir = $(libdir)/pkgconfig
-datadir = $(prefix)/share/ptabtools
-VERSION = @PACKAGE_VERSION@
-LDFLAGS = @LDFLAGS@
-
-LIBXML_CFLAGS = @LIBXML_CFLAGS@
-LIBXML_LIBS = @LIBXML_LIBS@
-
-LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
-LIBXSLT_LIBS = @LIBXSLT_LIBS@
-
-PROGS = @PROGS@
-LIBS = libptb.so.$(VERSION) libptb.a
-PROGS_MANPAGES = $(patsubst %,%.1,$(PROGS))
-INSTALL = @INSTALL@
-CFLAGS = @CFLAGS@ -g -Wall 
-CFLAGS += -DHAVE_CONFIG_H=
-POPT_LIBS = -lpopt
-XSLT_DEFINE = -DMUSICXMLSTYLESHEET=\"$(datadir)/ptbxml2musicxml.xsl\"
+-include Makefile.settings
 
 PTBSO_OBJS = ptb.o gp.o
 
-all: $(PROGS) $(LIBS)
+all: $(PROGS)
 
 ptb2xml.o: ptb2xml.c
        $(CC) $(CFLAGS) -c $< $(LIBXSLT_CFLAGS) $(LIBXML_CFLAGS) $(XSLT_DEFINE)
@@ -34,28 +10,31 @@ ptb2xml.o: ptb2xml.c
 %.o: %.c
        $(CC) $(CFLAGS) -c $< 
 
+ptb.dll: $(PTBSO_OBJS)
+       $(CC) -shared $(CFLAGS) -o $@ $^
+
 libptb.so.$(VERSION): $(PTBSO_OBJS)
        $(CC) -shared $(CFLAGS) -o $@ $^
 
 libptb.a: $(PTBSO_OBJS)
        $(AR) rs $@ $^
 
-ptb2xml: ptb2xml.o ptb.o
+ptb2xml$(EXEEXT): ptb2xml.o ptb.o
        $(CC) $(LDFLAGS) -o $@ $^ $(POPT_LIBS) $(LIBXML_LIBS) $(LIBXSLT_LIBS)
        
-ptb2ascii: ptb2ascii.o ptb.o
+ptb2ascii$(EXEEXT): ptb2ascii.o ptb.o
        $(CC) $(LDFLAGS) -o $@ $^ $(POPT_LIBS)
 
-ptb2ptb: ptb2ptb.o ptb.o
+ptb2ptb$(EXEEXT): ptb2ptb.o ptb.o
        $(CC) $(LDFLAGS) -o $@ $^ $(POPT_LIBS)
 
-ptb2ly: ptb2ly.o ptb.o
+ptb2ly$(EXEEXT): ptb2ly.o ptb.o
        $(CC) $(LDFLAGS) -o $@ $^ $(POPT_LIBS)
 
-gp2ly: gp2ly.o gp.o
+gp2ly$(EXEEXT): gp2ly.o gp.o
        $(CC) $(LDFLAGS) -o $@ $^ $(POPT_LIBS)
 
-ptbinfo: ptbinfo.o ptb.o
+ptbinfo$(EXEEXT): ptbinfo.o ptb.o
        $(CC) $(LDFLAGS) -o $@ $^ $(POPT_LIBS)
 
 install: all

diff --git a/Makefile.settings.in b/Makefile.settings.in
index 549559db9c9468508ef12b58cf47eea8753114ed..3baca18fa41dbafd3f04dd2d9ac15d3342862c6a 100644 (file)
--- a/Makefile.settings.in
+++ b/Makefile.settings.in
@@ -16,7 +16,6 @@ LIBXSLT_CFLAGS = @LIBXSLT_CFLAGS@
 LIBXSLT_LIBS = @LIBXSLT_LIBS@
 
 PROGS = @PROGS@
-LIBS = libptb.so.$(VERSION) libptb.a
 PROGS_MANPAGES = $(patsubst %,%.1,$(PROGS))
 INSTALL = @INSTALL@
 CFLAGS = @CFLAGS@ -g -Wall 

diff --git a/configure.in b/configure.in
index aad5d513da326635dd61b2394ea3065dfa33015f..09792554aa7dda70f0ed44aecd4e5feae416c356 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,10 @@ AC_CONFIG_HEADER([config.h])
 AC_PROG_CC
 AC_PROG_INSTALL
 
+AC_MINGW32
+AC_EXEEXT
+AC_OBJEXT
+
 PROGS="ptb2ly ptb2ascii ptbinfo gp2ly"
 
 # Checks for libraries.
@@ -16,6 +20,14 @@ AC_CHECK_LIB([popt], [poptGetArg], , AC_MSG_ERROR([Popt is required]))
 PKG_CHECK_MODULES(LIBXML, libxml-2.0, [ PROGS="$PROGS ptb2xml" ] , AC_MSG_WARN([libxml not found: not building ptb2xml]))
 PKG_CHECK_MODULES(LIBXSLT, libxslt, AC_DEFINE(HAVE_XSLT, 1, [whether libxslt is available]) , AC_MSG_WARN([libxslt not found: ptb2xml will not support musicxml]))
 
+if test "$MINGW32" = "yes"; then 
+       PROGS="$PROGS ptb.dll" 
+else
+       PROGS="$PROGS libptb.so.$PACKAGE_VERSION"
+fi
+
+PROGS="$PROGS libptb.a"
+
 AC_SUBST(PROGS)
 
 # Checks for header files.