Silence two -Wlogical-op warnings.
[gnupg.git] / common / Makefile.am
index 422fcf6..72e3fb4 100644 (file)
@@ -14,7 +14,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, see <http://www.gnu.org/licenses/>.
+# along with this program; if not, see <https://www.gnu.org/licenses/>.
 
 ## Process this file with automake to produce Makefile.in
 
@@ -88,7 +88,6 @@ common_sources = \
        helpfile.c \
        mkdir_p.c mkdir_p.h \
        strlist.c strlist.h \
-       call-gpg.c call-gpg.h \
        exectool.c exectool.h \
        server-help.c server-help.h \
        name-value.c name-value.h \
@@ -114,11 +113,14 @@ endif
 without_npth_sources = \
         get-passphrase.c get-passphrase.h
 
+# Sources only useful with NPTH.
+with_npth_sources = \
+        call-gpg.c call-gpg.h
 
 libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
 
-libcommonpth_a_SOURCES = $(common_sources)
+libcommonpth_a_SOURCES = $(common_sources) $(with_npth_sources)
 libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 
 if !HAVE_W32CE_SYSTEM
@@ -175,7 +177,7 @@ endif
 t_extra_src = t-support.h
 
 t_common_cflags = $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS) \
-                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS)
+                  $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 t_common_ldadd = libcommon.a \
                  $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) \
                 $(LIBINTL) $(LIBICONV)