summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2011-05-29 15:52:14 (GMT)
committer Jaromil <jaromil@dyne.org>2011-05-29 15:52:52 (GMT)
commitda1a5999ae28083d38940ae51c5049797c436b5e (patch)
treeaad433468144abd5ea4557c1089937b3f212fc1c
parent36089b6195959ccfd83b3e0b410202f61e468a52 (diff)
code reorganization to compile distcheck
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac9
-rw-r--r--doc/Makefile.am4
-rw-r--r--src/Makefile.am8
-rw-r--r--src/slw/Makefile.am16
-rw-r--r--src/slw/jutils.cpp (renamed from src/jutils.cpp)0
-rw-r--r--src/slw/jutils.h (renamed from src/jutils.h)0
-rw-r--r--src/slw/linklist.cpp (renamed from src/linklist.cpp)0
-rw-r--r--src/slw/linklist.h (renamed from src/linklist.h)0
9 files changed, 23 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am
index f963eff..1799d25 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = src \ No newline at end of file
+SUBDIRS = src doc
+
diff --git a/configure.ac b/configure.ac
index 56161a5..f4a581b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,13 +32,7 @@ dnl Checks for required programs.
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
-
-dnl compatibility with older libtool
-m4_ifdef([LT_INIT],
- [LT_INIT([disable-static dlopen])],
- [AC_LIBTOOL_DLOPEN
- AC_DISABLE_STATIC
- AC_PROG_LIBTOOL])
+AC_PROG_RANLIB
dnl Check for slang
PKG_CHECK_MODULES([SLANG], [slang], [have_slang=yes], [have_slang=no])
@@ -57,6 +51,7 @@ AC_CONFIG_FILES([
Makefile
src/Makefile
src/slw/Makefile
+doc/Makefile
])
AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..1d6003b
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,4 @@
+
+EXTRA_DIST = tbt.1
+
+man_MANS = tbt.1
diff --git a/src/Makefile.am b/src/Makefile.am
index 5738e79..f572e0f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,13 @@
SUBDIRS = slw
+
AM_CXXFLAGS = -I$(top_srcdir)/src/slw
-SOURCES = tbt.cpp linklist.cpp jutils.cpp rtclock.cpp
-LIBS = -lpthread -lslang $(top_srcdir)/src/slw/libslw.la
+SOURCES = tbt.cpp rtclock.cpp
+
+noinst_HEADERS = tbt.h rtclock.h
+
+LIBS = -lpthread -lslang $(top_builddir)/src/slw/libslw.a
bin_PROGRAMS = tbt recmail tbtcheck rtctest
diff --git a/src/slw/Makefile.am b/src/slw/Makefile.am
index db92485..a7b0836 100644
--- a/src/slw/Makefile.am
+++ b/src/slw/Makefile.am
@@ -1,9 +1,11 @@
-SOURCES = slw_console.cpp slw.cpp slw_popup.cpp slw_log.cpp slw_prompt.cpp \
- abs_text_console.cpp slw_text.cpp ../linklist.cpp ../jutils.cpp
-noinst_LTLIBRARIES = libslw.la
-libslw_la_SOURCES = $(SOURCES)
-libslw_la_LIBADD = -lslang
-libslw_la_CXXFLAGS = -I$(top_srcdir)/src
+noinst_HEADERS = abs_text_console.h keycodes.h slw_console.h slw_log.h \
+ slw_prompt.h jutils.h linklist.h slw.h \
+ slw_popup.h slw_text.h
+
+noinst_LIBRARIES = libslw.a
+
+libslw_a_SOURCES = slw_console.cpp slw.cpp slw_popup.cpp slw_log.cpp \
+ slw_prompt.cpp abs_text_console.cpp \
+ slw_text.cpp linklist.cpp jutils.cpp
-# libfreej_la_LDFLAGS = $(FREEJ_LIBS) -version-info $(FREEJ_VERSION_INFO)
diff --git a/src/jutils.cpp b/src/slw/jutils.cpp
index b1d6449..b1d6449 100644
--- a/src/jutils.cpp
+++ b/src/slw/jutils.cpp
diff --git a/src/jutils.h b/src/slw/jutils.h
index a6bf5dc..a6bf5dc 100644
--- a/src/jutils.h
+++ b/src/slw/jutils.h
diff --git a/src/linklist.cpp b/src/slw/linklist.cpp
index 6d86df2..6d86df2 100644
--- a/src/linklist.cpp
+++ b/src/slw/linklist.cpp
diff --git a/src/linklist.h b/src/slw/linklist.h
index a8ca3fc..a8ca3fc 100644
--- a/src/linklist.h
+++ b/src/slw/linklist.h