Merged across diffs between setup_crypto_branch_branchpoint and

[cygwin-apps/setup.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f8605e0a218c2b5ce676f18cf8826d27bd031aa8..58186af2d25218bb27bc95608b0d80baf74dbbba 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,8 +18,8 @@
 #
 # Makefile for Cygwin installer
 
-DIST_SUBDIRS = libgetopt++ tests
-SUBDIRS = libgetopt++ tests
+DIST_SUBDIRS = libgetopt++ tests libgpg-error libgcrypt
+SUBDIRS = libgetopt++ tests libgpg-error libgcrypt
 
 ## DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 
@@ -35,7 +35,7 @@ AM_CFLAGS = $(AM_CXXFLAGS) -Wmissing-declarations -Winline \
 AM_YFLAGS = -d
 AM_LFLAGS = -8
 WINDRES = @WINDRES@
-AM_CPPFLAGS = -I$(srcdir)/libgetopt++/include
+AM_CPPFLAGS = -I$(srcdir)/libgetopt++/include -I$(top_builddir)/libgpg-error/src -I$(top_builddir)/libgcrypt/src -I$(srcdir)/libgcrypt/src
 
 noinst_PROGRAMS = setup @INILINT@
 
@@ -115,10 +115,11 @@ libinilex_a_SOURCES = inilex.ll
 libinilex_a_CXXFLAGS = $(BASECXXFLAGS)
 
 setup_LDADD = \
-       libinilex.a libgetopt++/libgetopt++.la \
-       res.o \
-       -lcomctl32 -lole32 -lwsock32 -lnetapi32 -luuid -lbz2 -lz
-setup_LDFLAGS = -mwindows
+       libinilex.a libgetopt++/libgetopt++.la res.o \
+       libgcrypt/src/.libs/libgcrypt.a \
+       libgpg-error/src/.libs/libgpg-error.a \
+       -lcomctl32 -lole32 -lwsock32 -lnetapi32 -luuid -lbz2 -lz 
+setup_LDFLAGS = -mwindows -Wl,-static
 setup_SOURCES = \
        AntiVirus.cc \
        AntiVirus.h \
@@ -140,6 +141,9 @@ setup_SOURCES = \
        ConnectionSetting.h \
        ControlAdjuster.cc \
        ControlAdjuster.h \
+       crypto.cc \
+       crypto.h \
+       cyg-pubkey.h \
        cygpackage.cc \
        cygpackage.h \
        desktop.cc \
@@ -162,6 +166,8 @@ setup_SOURCES = \
        Generic.h \
        geturl.cc \
        geturl.h \
+       gpg-packet.cc \
+       gpg-packet.h \
        ini.cc \
        ini.h \
        IniDBBuilder.h \
@@ -182,6 +188,8 @@ setup_SOURCES = \
        io_stream_memory.cc \
        io_stream_memory.h \
        IOStreamProvider.h \
+       KeysSetting.cc \
+       KeysSetting.h \
        localdir.cc \
        localdir.h \
        LogFile.cc \
@@ -305,4 +313,4 @@ release: setup.exe $(srcdir)/ChangeLog Makefile
 # Create a snapshot and upload it (requires write access)
 snapshot: release
        scp -C setup-${VER}.exe setup-debug-${VER}.exe.gz setup-${VER}.tar.bz2 \
-           $${cygwinsite}:setup-snapshots/
+           $${cygwinsite:-cygwin.com}:setup-snapshots/