Move guimain.cpp out of the way.

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

diff --git a/Makefile.in b/Makefile.in
index 7458161..612d236 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,11 +60,14 @@ 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
 
@@ -79,7 +82,7 @@ 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)
@@ -94,7 +97,7 @@ GUI_LDFLAGS = -mwindows $(LDFLAGS)
 %.$(OBJEXT): %.ico
        echo $* ICON $*.ico | $(WINDRES) -I ${srcdir}/icons -o $@
 #
-gui$(EXEEXT): guimain.$(OBJEXT) pkgicon.$(OBJEXT)
+gui$(EXEEXT): guistub.$(OBJEXT) pkgicon.$(OBJEXT)
        $(CXX) -o $@ $(CXXFLAGS) $(GUI_LDFLAGS) $+
 
 lastrites$(EXEEXT): rites.$(OBJEXT)