make distcheck works

diff --git a/.cvsignore b/.cvsignore
index f465e388528bde88d57977faf2165289577cf810..d18bc55f5f9fd038b4b0f3183adb7bafef3d816f 100644 (file)
--- a/.cvsignore
+++ b/.cvsignore
@@ -13,3 +13,4 @@ ltmain.sh
 missing
 mkinstalldirs
 ltconfig
+depcomp

diff --git a/gen b/gen
index 33b187006a72f0015c241ba3130ba68e57c82671..c5be169fe9393c420d72327fab636261807cfc01 100755 (executable)
--- a/gen
+++ b/gen
@@ -1,4 +1,9 @@
 #!/bin/sh
-libtoolize -f -c ; aclocal ; autoheader ; automake --foreign -a -c ; autoconf
+libtoolize -f -c ;
+aclocal ;
+autoheader ;
+automake --foreign -a -c ;
+autoconf ;
+automake --foreign
 
 

diff --git a/include/.cvsignore b/include/.cvsignore
index 95b13fe5a58b88add0b54cec89f01de91d2f39ea..ff76ec0c3ae66c939dbed961b5b83a312dca16b8 100644 (file)
--- a/include/.cvsignore
+++ b/include/.cvsignore
@@ -4,3 +4,4 @@ Makefile.in
 Makefile
 libfaim_config.h
 stamp-h
+stamp-h1

diff --git a/src/Makefile.am b/src/Makefile.am
index 9b739bcbcc566971ca2a0fbcf94cbcc2f756964d..fbc281b2854f408c25516a9228c1828943e560fa 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,5 +26,5 @@ libfaim_la_SOURCES =  admin.c         \
                        util.c          \
                        md5.c
 
-CFLAGS += -I../include -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\"
+CFLAGS += -I\$(top_srcdir)/include -DAIM_BUILDDATE=\"`date +%Y%m%d`\" -DAIM_BUILDTIME=\"`date +%H%M%S`\"
 

diff --git a/utils/faimtest/Makefile.am b/utils/faimtest/Makefile.am
index b2107ec4cdc716cff342239fcdfbb25475d02fe7..4c89cc9408e69b7b9d74afb32a6850798f020601 100644 (file)
--- a/utils/faimtest/Makefile.am
+++ b/utils/faimtest/Makefile.am
@@ -2,6 +2,6 @@
 bin_PROGRAMS = faimtest
 faimtest_SOURCES = faimtest.h faimtest.c commands.c login.c ft.c chat.c
 INCLUDES = -I$(top_srcdir)/include
-faimtest_LDADD = -L$(top_srcdir)/src/ -lfaim @READLINELIB@
-faimtest_DEPENDENCIES = $(top_srcdir)/src/.libs/libfaim.a
+faimtest_LDADD = ../../src/libfaim.la @READLINELIB@
+faimtest_DEPENDENCIES = ../../src/libfaim.la