Correct processing of package group associations.

[mingw/mingw-get.git] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index ac2e67a..d56bc6f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -119,20 +119,24 @@ AWK_PRINT_LINE_BUFFER = print linebuf;
 # specific package meta-data into compiled resource modules.
 #
 RC = @RC@
-RC_SCRIPT = tag=$(BUILD_TAG); \
-  test "x$$tag" != x && tag="-$(GUI_RELEASE_CLASS)-$$tag"; \
+RC_SCRIPT = tag_class=$(GUI_RELEASE_CLASS) \
     $(TAG_SCRIPT)
 
-VERSION_SCRIPT = tag=$(BUILD_TAG); \
-  test "x$$tag" != x && tag="-$(CLI_RELEASE_CLASS)-$$tag"; \
+VERSION_SCRIPT = tag_class=$(CLI_RELEASE_CLASS) \
     $(TAG_SCRIPT)
 
-TAG_SCRIPT = sed \
-  -e "s!%PACKAGE_NAME%!$(PACKAGE_TARNAME)!g" \
-  -e "s!%PACKAGE_VERSION%!$(PACKAGE_VERSION)$$tag!g" \
-  -e "s!%PACKAGE_VERINFO_PRODUCT_VERSION%!`$(PACKAGE_VERINFO_SCRIPT)`!g" \
-  -e "s!%COPYRIGHT_HOLDER%!@COPYRIGHT_HOLDER@!g" \
-  -e "s!%YEARS_OF_ISSUE%!@YEARS_OF_ISSUE@!g"
+TAG_SCRIPT = tag=$(BUILD_TAG); \
+  test "x$$tag_class" != x && test "x$$tag" != x && tag="$$tag_class-$$tag"; \
+  test "x$$tag" != x && tag="-$$tag"; \
+  sed  \
+    -e "s!%PACKAGE_NAME%!$(PACKAGE_TARNAME)!g" \
+    -e "s!%PACKAGE_VERSION%!$(PACKAGE_VERSION)$$tag!g" \
+    -e "s!%PACKAGE_VERINFO_PRODUCT_VERSION%!`$(PACKAGE_VERINFO_SCRIPT)`!g" \
+    -e "s!%PACKAGE_BASE_DISTNAME%!$(PACKAGE_DISTNAME)$$tag-%s.$(TAREXT)!g" \
+    -e "s!%PACKAGE_DATA_DISTNAME%!$(SETUP_DISTNAME)$$tag-%s.$(TAREXT)!g" \
+    -e "s!%PACKAGE_DIST_URL%!@PACKAGE_DIST_DOMAIN@/@PACKAGE_DIST_DIR@!g" \
+    -e "s!%COPYRIGHT_HOLDER%!@COPYRIGHT_HOLDER@!g" \
+    -e "s!%YEARS_OF_ISSUE%!@YEARS_OF_ISSUE@!g"
 
 PACKAGE_VERINFO_SCRIPT = \
   echo $(PACKAGE_VERSION) | awk -F. '{ \
@@ -169,23 +173,44 @@ CLI_EXE_OBJECTS  =   \
    clistub.$(OBJEXT) version.$(OBJEXT) approot.$(OBJEXT) getopt.$(OBJEXT)
 
 GUIMAIN_OBJECTS  =   \
-   guimain.$(OBJEXT) guiexec.$(OBJEXT) dmhguix.$(OBJEXT) \
-   approot.$(OBJEXT) pkgview.$(OBJEXT) pkgtree.$(OBJEXT) pkglist.$(OBJEXT) \
-   pkgdata.$(OBJEXT) pkgnget.$(OBJEXT) guimain.res.$(OBJEXT)
+   guimain.$(OBJEXT) dmhguix.$(OBJEXT) $(GUIMAIN_LIB_OBJECTS) \
+   approot.$(OBJEXT) guimain.res.$(OBJEXT)
+
+GUIMAIN_LIB_OBJECTS = \
+   guiexec.$(OBJEXT) pkgview.$(OBJEXT) pkgtree.$(OBJEXT) pkglist.$(OBJEXT) \
+   pkgdata.$(OBJEXT) pkgnget.$(OBJEXT)
 
 GUIMAIN_LIBS = -lwtklite -lcomctl32
 
+SETUP_TOOL_OBJECTS = setup.$(OBJEXT) setup.res.$(OBJEXT) apihook.$(OBJEXT)
+SETUP_TOOL_LIBS = -lwtklite -lwininet -lcomctl32 -lole32 -Wl,-Bstatic -llzma
+
+SETUP_DLL_OBJECTS =  \
+   dllhook.$(OBJEXT) $(GUIMAIN_LIB_OBJECTS) guimain.res.$(OBJEXT)
+
+SETUP_DLL_LIBS = $(GUIMAIN_LIBS)
+
 script_srcdir = ${srcdir}/scripts/libexec
 
 BIN_PROGRAMS = pkginfo$(EXEEXT) mingw-get$(EXEEXT)
 LIBEXEC_PROGRAMS = guistub$(EXEEXT) guimain$(EXEEXT) lastrites$(EXEEXT)
-LIBEXEC_SCRIPTS = ${script_srcdir}/setup.lua ${script_srcdir}/wsh.lua \
-   ${script_srcdir}/shlink.js ${script_srcdir}/unlink.js
 LIBEXEC_DATA = mingw-get-0.dll
 
+LIBEXEC_SCRIPTS = ${script_srcdir}/setup.lua \
+   ${script_srcdir}/shlink.js ${script_srcdir}/unlink.js
+
 # Primary build goals...
 #
-all: $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS) $(LIBEXEC_DATA)
+all: all-core all-setup
+all-core: $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS) $(LIBEXEC_DATA)
+all-setup: all-setup-dll all-setup-exe
+all-setup-dll: mingw-get-setup-0.dll
+
+all-setup-exe:
+       @$(QUIET_MAKE) CXXFLAGS='$(CXXFLAGS) -Os' mingw-get-setup$(EXEEXT)
+
+mingw-get-setup$(EXEEXT): $(SETUP_TOOL_OBJECTS)
+       $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+ $(SETUP_TOOL_LIBS)
 
 pkginfo$(EXEEXT):  driver.$(OBJEXT) pkginfo.$(OBJEXT)
        $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $+
@@ -205,6 +230,9 @@ lastrites$(EXEEXT): rites.$(OBJEXT)
 mingw-get-0.dll: $(CORE_DLL_OBJECTS)
        $(CXX) -shared -o $@ $(CXXFLAGS) $(LDFLAGS) $+ $(LIBS)
 
+mingw-get-setup-0.dll: $(SETUP_DLL_OBJECTS) mingw-get-0.dll
+       $(CXX) -shared -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+ $(SETUP_DLL_LIBS)
+
 # The following recursive invocation hook provides a mechanism for
 # accessing make's facility for reporting what it is doing, even when
 # the command to be invoked is encapsulated within a more complex block,
@@ -271,7 +299,7 @@ time-stamp:
 
 # The following dependencies must be explicitly declared.
 #
-guimain.res.$(OBJEXT): Makefile build.time verinfo.h
+guimain.res.$(OBJEXT) setup.res.$(OBJEXT): Makefile build.time verinfo.h
 verinfo.h version.c: Makefile build.time
 
 # Installation tools and directory paths...
@@ -341,7 +369,8 @@ SRCDIST_SUBDIRS = src src/pkginfo srcdist-doc icons \
 # from the project's global build-aux repository...
 #
 BUILD_AUX_DIRS = build-aux build-aux/m4
-BUILD_AUX_FILES = config.guess config.sub install-sh missing.m4
+BUILD_AUX_FILES = config.guess config.sub install-sh \
+  makeopts.m4 missing.m4
 
 # The names of distributed package archive files incorporate version
 # information, derived from PACKAGE_VERSION; this is decomposed, so that
@@ -360,6 +389,8 @@ PACKAGE_DISTVERSION = `echo $(PACKAGE_VERSION)-$(PACKAGE_SUBSYSTEM) | sed \
   -e 's,-$(PACKAGE_SUBSYSTEM),$(SNAPSHOT)&,'`
 PACKAGE_DISTNAME = $(PACKAGE_TARNAME)-$(PACKAGE_DISTVERSION)
 
+SETUP_DISTNAME = $(PACKAGE_TARNAME)-setup-$(PACKAGE_DISTVERSION)
+
 dist: srcdist bindist readme.txt.dist
 
 # Specify where distributable files should be collected; by default,
@@ -505,11 +536,14 @@ readme.txt.in: README.in NEWS.in INSTALL.in
 
 # Workspace clean-up...
 #
-clean:
+mostlyclean:
        rm -f *.$(OBJEXT) *.d *.dll $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS)
 
+clean: mostlyclean
+       rm -f version.c verinfo.h
+
 distclean: clean
-       rm -f config.* version.c build.tag build.time
+       rm -f config.* build.tag build.time
 
 maintainer-clean: distclean
        rm -f README NEWS INSTALL readme.txt Makefile pkginfo.c