diff --git a/Makefile.in b/Makefile.in index 1095bc7..848e2a6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -69,6 +69,7 @@ CONVERT=@CONVERT@ OPTIPNG=@OPTIPNG@ ZIP=@ZIP@ DOXYGEN=@DOXYGEN@ +DLLTOOL=@DLLTOOL@ #---[ Paths ]---------------------------------------------------------------------------- @@ -204,7 +205,7 @@ $(BINRLS)/$(LIBNAME).delayed.a: \ @$(MKDIR) $(dir $@) @echo $< ... - @@DLLTOOL@ \ + @$(DLLTOOL) \ --input-def $(BINRLS)/$(LIBNAME).def \ --dllname $(LIBNAME).dll \ --kill-at \ @@ -276,12 +277,16 @@ install-delayed: \ $(BINRLS)/$(LIBNAME).delayed.a # Install static library - @$(MKDIR) $(DESTDIR)$(libdir) + @$(MKDIR) \ + $(DESTDIR)$(libdir) + @$(INSTALL_DATA) \ $(BINRLS)/$(LIBNAME).delayed.a \ $(DESTDIR)$(libdir) - @$(MKDIR) $(DESTDIR)$(libdir)/pkgconfig + @$(MKDIR) \ + $(DESTDIR)$(libdir)/pkgconfig + @$(INSTALL_DATA) \ sdk/lib3270-delayed.pc \ $(DESTDIR)$(libdir)/pkgconfig/lib3270-delayed.pc @@ -309,6 +314,29 @@ install-dev: \ @$(MKDIR) $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot @$(INSTALL_DATA) $(POTDIR)/lib3270.pot $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/pot/lib3270.pot + +install-winlib: \ + $(BINRLS)/$(SONAME) + + @$(MKDIR) \ + $(DESTDIR)$(libdir) + + @$(INSTALL_DATA) \ + $(BINRLS)/$(LIBNAME).dll.a \ + $(DESTDIR)$(libdir) + + @$(DLLTOOL) \ + --input-def $(BINRLS)/$(LIBNAME).def \ + --dllname $(LIBNAME).dll \ + --output-lib $(DESTDIR)$(libdir)/$(LIBNAME).lib + + @$(MKDIR) \ + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def + + @$(INSTALL_DATA) \ + $(BINRLS)/$(LIBNAME).def \ + $(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def + #---[ Misc Targets ]--------------------------------------------------------------------- $(BASEDIR)/.tmp/$(LIBNAME)/fallbacks.c: \ diff --git a/configure.ac b/configure.ac index 164dd8d..97840d0 100644 --- a/configure.ac +++ b/configure.ac @@ -82,8 +82,9 @@ case "$host" in CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600" LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32" LDFLAGS="$LDFLAGS -pthread" - DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def" + DLL_LDFLAGS="-shared -Wl,--output-def,\$(@D)/\$(LIBNAME).def,--out-implib,\$(@D)/\$(LIBNAME).dll.a" DLLEXT=".dll" + INSTALL_PACKAGES="${INSTALL_PACKAGES} winlib" app_win32_revision=$(date +%-y.%-m.%-d.%-H) AC_SUBST(WIN32_VERSION,$app_win32_revision) -- libgit2 0.21.2