From 842e80552ac5f34552b38eac742efe4527ebdb86 Mon Sep 17 00:00:00 2001
From: Pekka Riikonen <priikone@silcnet.org>
Date: Tue, 29 May 2001 12:29:26 +0000
Subject: [PATCH] 	updates

---
 Makefile.defines.pre   | 8 --------
 apps/irssi/autogen.sh  | 1 -
 apps/silc/Makefile.am  | 3 ++-
 apps/silcd/Makefile.am | 3 ++-
 prepare                | 2 +-
 prepare-clean          | 2 +-
 6 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/Makefile.defines.pre b/Makefile.defines.pre
index 74ff4056..bac18450 100644
--- 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 03a6b118..cb258c46 100755
--- 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 48f284ee..47bcd80d 100644
--- 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 f8d3246c..c9b7e988 100644
--- 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 ae760976..49d2276d 100755
--- a/prepare
+++ b/prepare
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #
 #  prepare
 #
diff --git a/prepare-clean b/prepare-clean
index ac4b2103..f7ad79f8 100755
--- a/prepare-clean
+++ b/prepare-clean
@@ -1,4 +1,4 @@
-#!/bin/sh
+#! /bin/sh
 #
 #  prepare-clean
 #
-- 
2.24.0