Move guimain.cpp out of the way.

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

diff --git a/Makefile.in b/Makefile.in
index e6ae92a..612d236 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,7 +6,7 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 
 # Written by Keith Marshall <keithmarshall@users.sourceforge.net>
-# Copyright (C) 2009, 2010, 2011, MinGW Project
+# Copyright (C) 2009, 2010, 2011, 2012, MinGW Project
 #
 #
 # Makefile template for mingw-get
@@ -32,6 +32,7 @@ abs_top_srcdir = @abs_top_srcdir@
 
 DEBUGLEVEL = @DEBUGLEVEL@
 
+vpath %.ico @srcdir@/icons
 VPATH = @top_srcdir@/src:@top_srcdir@/src/pkginfo:@top_srcdir@/tinyxml
 
 CC = @CC@
@@ -48,23 +49,32 @@ LEX = @LEX@
 AR = @AR@
 ARFLAGS = @ARFLAGS@
 
+WINDRES = @WINDRES@
+
 OBJEXT = @OBJEXT@
 EXEEXT = @EXEEXT@
 
 LDFLAGS = @LDFLAGS@
-LIBS = -Wl,-Bstatic -lz -lbz2 -llzma -Wl,-Bdynamic -lwininet
+LIBS = -Wl,-Bstatic -llua -lz -lbz2 -llzma -Wl,-Bdynamic -lwininet
 
 CORE_DLL_OBJECTS  =  climain.$(OBJEXT) pkgshow.$(OBJEXT) dmh.$(OBJEXT) \
    pkgbind.$(OBJEXT) pkginet.$(OBJEXT) pkgstrm.$(OBJEXT) pkgname.$(OBJEXT) \
    pkgexec.$(OBJEXT) pkgfind.$(OBJEXT) pkginfo.$(OBJEXT) pkgspec.$(OBJEXT) \
-   sysroot.$(OBJEXT) pkghash.$(OBJEXT) pkgkeys.$(OBJEXT) pkgdeps.$(OBJEXT) \
-   mkpath.$(OBJEXT)  pkgreqs.$(OBJEXT) pkginst.$(OBJEXT) pkgunst.$(OBJEXT) \
+   pkgopts.$(OBJEXT) sysroot.$(OBJEXT) pkghash.$(OBJEXT) pkgkeys.$(OBJEXT) \
+   pkgdeps.$(OBJEXT) pkgreqs.$(OBJEXT) pkginst.$(OBJEXT) pkgunst.$(OBJEXT) \
    tarproc.$(OBJEXT) xmlfile.$(OBJEXT) keyword.$(OBJEXT) vercmp.$(OBJEXT) \
-   tinyxml.$(OBJEXT) tinyxmlparser.$(OBJEXT) \
-   tinystr.$(OBJEXT) tinyxmlerror.$(OBJEXT)
+   tinyxml.$(OBJEXT) tinystr.$(OBJEXT) tinyxmlparser.$(OBJEXT) \
+   mkpath.$(OBJEXT)  tinyxmlerror.$(OBJEXT)
+
+CLI_EXE_OBJECTS  =   \
+   clistub.$(OBJEXT) version.$(OBJEXT) approot.$(OBJEXT) getopt.$(OBJEXT)
+
+script_srcdir = ${srcdir}/scripts/libexec
 
 BIN_PROGRAMS = pkginfo$(EXEEXT) mingw-get$(EXEEXT)
 LIBEXEC_PROGRAMS = gui$(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
 
 all: $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS) $(LIBEXEC_DATA)
@@ -72,12 +82,22 @@ all: $(BIN_PROGRAMS) $(LIBEXEC_PROGRAMS) $(LIBEXEC_DATA)
 pkginfo$(EXEEXT):  driver.$(OBJEXT) pkginfo.$(OBJEXT)
        $(CC) -o $@ $(CFLAGS) $(LDFLAGS) $+
 
-mingw-get$(EXEEXT): clistub.$(OBJEXT) version.$(OBJEXT) getopt.$(OBJEXT)
+mingw-get$(EXEEXT): $(CLI_EXE_OBJECTS)
        $(CXX) -o $@ $(CXXFLAGS) $(LDFLAGS) $+
 
 GUI_LDFLAGS = -mwindows $(LDFLAGS)
 
-gui$(EXEEXT): guimain.$(OBJEXT)
+# FIXME: the following is a Q&D kludge, to assign my choice of icon
+# to the GUI mode executable stub.  Eventually, this will need to be
+# assigned within a resource definition file, but for the time being,
+# besides providing a notification that the GUI is not yet available,
+# the stub serves only to illustrate mingw-get's shortcut creation
+# capability; thus, this simple hack will suffice.
+#
+%.$(OBJEXT): %.ico
+       echo $* ICON $*.ico | $(WINDRES) -I ${srcdir}/icons -o $@
+#
+gui$(EXEEXT): guistub.$(OBJEXT) pkgicon.$(OBJEXT)
        $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+
 
 lastrites$(EXEEXT): rites.$(OBJEXT)
@@ -133,7 +153,7 @@ install: installdirs install-profile
        for image in $(LIBEXEC_PROGRAMS); do \
          $(INSTALL_PROGRAM) $$image ${libexecdir}/${PACKAGE_TARNAME}; \
          done
-       for image in $(LIBEXEC_DATA); do \
+       for image in $(LIBEXEC_DATA) $(LIBEXEC_SCRIPTS); do \
          $(INSTALL_DATA) $$image ${libexecdir}/${PACKAGE_TARNAME}; \
          done
 
@@ -155,7 +175,8 @@ LICENCE_FILES = README COPYING
 SRCDIST_FILES = $(LICENCE_FILES) ChangeLog NEWS INSTALL \
   aclocal.m4 configure.ac configure Makefile.in version.c.in
 
-SRCDIST_SUBDIRS = build-aux m4 src src/pkginfo srcdist-doc tinyxml xml
+SRCDIST_SUBDIRS = build-aux icons m4 src src/pkginfo srcdist-doc \
+  scripts/libexec tinyxml xml
 
 # The names of distributed pacakge archive files incorporate version
 # information, derived from PACKAGE_VERSION; this is decomposed, so that
@@ -212,7 +233,8 @@ srcdist: srcdist-doc
            || $(LN_S) ../$$file .; \
          done
        for dir in $(SRCDIST_SUBDIRS); do \
-         mkdir ${PACKAGE_DISTROOT}/$$dir && cd ${PACKAGE_DISTROOT}/$$dir; \
+         $(mkinstalldirs) ${PACKAGE_DISTROOT}/$$dir \
+         && cd ${PACKAGE_DISTROOT}/$$dir; \
          for file in `cd ${abs_top_srcdir}/$$dir && echo *`; do \
            if test -f ${abs_top_srcdir}/$$dir/$$file; then \
              $(LN_S) ${abs_top_srcdir}/$$dir/$$file .; \