updates

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index 74ff4056de8623355bad699d0a8646950de1b87b..bac184503781cb1fa8d9ea1e3a6e442e802be3ec 100644 (file)
--- a/Makefile.defines.pre
+++ b/Makefile.defines.pre
@@ -54,11 +54,3 @@ INCLUDES = $(ADD_INCLUDES) \
         -I$(silc_top_srcdir)/includes \
         -I$(silc_top_srcdir)/doc \
        -I$(silc_top_srcdir)/lib/trq
-
-# Dummy variables to avoid automake warnings
-SILC_COMMON_LIBS=
-silc_etcdir=
-silc_modulesdir=
-silc_helpdir=
-silc_docdir=
-silc_logsdir=

diff --git a/apps/irssi/autogen.sh b/apps/irssi/autogen.sh
index 03a6b11889846e1347a67ba24e2422faadb73494..cb258c466c8bd5545c2bc5aee5b9fe5bc816b473 100755 (executable)
--- a/apps/irssi/autogen.sh
+++ b/apps/irssi/autogen.sh
@@ -2,7 +2,6 @@
 # Run this to generate all the initial makefiles, etc.
 
 srcdir=`dirname $0`
-echo $0
 test -z "$srcdir" && srcdir=.
 
 PKG_NAME="Irssi SILC"

diff --git a/apps/silc/Makefile.am b/apps/silc/Makefile.am
index 48f284ee4c1ba7df0b06db552225f427b64df07f..47bcd80d05c3f8f44074989543cff0dca76e4394 100644 (file)
--- a/apps/silc/Makefile.am
+++ b/apps/silc/Makefile.am
@@ -30,7 +30,8 @@ silc_SOURCES = \
 
 silc_DEPENDENCIES = ../lib/libsilcclient.a ../lib/libsilc.a
 
-LDADD = -L. -L.. -L../lib -lsilcclient $(SILC_COMMON_LIBS)
+LIBS=$(SILC_COMMON_LIBS)
+LDADD = -L. -L.. -L../lib -lsilcclient
 
 EXTRA_DIST = *.h
 

diff --git a/apps/silcd/Makefile.am b/apps/silcd/Makefile.am
index f8d3246c609ec3fc4863dbe2583066cc482f9607..c9b7e9884f2c82799da543a8073594a2b61a82f8 100644 (file)
--- a/apps/silcd/Makefile.am
+++ b/apps/silcd/Makefile.am
@@ -35,7 +35,8 @@ silcd_SOURCES = \
        server_version.c
 silcd_DEPENDENCIES = ../lib/libsilc.a
 
-LDADD = -L. $(SILC_COMMON_LIBS)
+LIBS = $(SILC_COMMON_LIBS)
+LDADD =
 
 EXTRA_DIST = *.h
 

diff --git a/prepare b/prepare
index ae760976a933ac2dc7b89736442d4d0fcdfce321..49d2276d81648002d6736ac4d13e1558d3619279 100755 (executable)
--- a/prepare
+++ b/prepare
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #
 #  prepare
 #

diff --git a/prepare-clean b/prepare-clean
index ac4b2103eaa1554721869f7362d01221c6d94e1b..f7ad79f8a170782884f8c9c0ba86805d2d97661e 100755 (executable)
--- a/prepare-clean
+++ b/prepare-clean
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #
 #  prepare-clean
 #