Skip to content

Commit

Permalink
win/Makefile.in: amend to [bc693446a9001783]: fixes "--disable-shared…
Browse files Browse the repository at this point in the history
…" build (make libtcl.a directly)
  • Loading branch information
sebres committed Oct 23, 2024
1 parent e95bdb0 commit 9fa648b
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion win/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ datarootdir = @datarootdir@
runstatedir = @runstatedir@
mandir = @mandir@

# Configure arguments
PKG_CFG_ARGS = @PKG_CFG_ARGS@

# The following definition can be set to non-null for special systems like AFS
# with replication. It allows the pathnames used for installation to be
# different than those used for actually reference files at run-time.
Expand Down Expand Up @@ -495,8 +498,15 @@ ${TCL_DLL_FILE}: ${TCL_LIB_FILE} ${TCL_OBJS} tcl.$(RES)
$(COPY) tclsh.exe.manifest ${TCL_DLL_FILE}.manifest
@VC_MANIFEST_EMBED_DLL@

ifeq (,$(findstring --disable-shared,$(PKG_CFG_ARGS)))
${TCL_LIB_FILE}:
@$(RM) ${TCL_DLL_FILE} $(TCL_LIB_FILE)
else
${TCL_LIB_FILE}: ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS}
@$(RM) ${TCL_LIB_FILE}
@MAKE_LIB@ ${TCL_OBJS} ${DDE_OBJS} ${REG_OBJS}
@POST_MAKE_LIB@
endif

${DDE_DLL_FILE}: ${TCL_STUB_LIB_FILE} ${DDE_OBJS}
@MAKE_DLL@ ${DDE_OBJS} $(TCL_STUB_LIB_FILE) $(SHLIB_LD_LIBS)
Expand Down Expand Up @@ -847,7 +857,6 @@ distclean: distclean-packages clean
# Bundled package targets
#

PKG_CFG_ARGS = @PKG_CFG_ARGS@
PKG_DIR = ./pkgs

packages:
Expand Down

0 comments on commit 9fa648b

Please sign in to comment.