Migrate to GNU build system

Move lbzip2 source files to "src" subdirectory. Remove Makefiles. Create initial "configure.ac" and "Makefile.am" files.
kjn · Aug 20, 2011 · 58d99b5 · 58d99b5
1 parent 9d2296a
commit 58d99b5
Show file tree

Hide file tree

Showing 23 changed files with 44 additions and 241 deletions.
diff --git a/AUTHORS b/AUTHORS
diff --git a/GPL-3.0 → COPYING b/GPL-3.0 → COPYING
diff --git a/ChangeLog b/ChangeLog
diff --git a/Makefile b/Makefile
diff --git a/Makefile.am b/Makefile.am
@@ -0,0 +1,2 @@
+SUBDIRS = yambi lib src doc
+ACLOCAL_AMFLAGS = -Im4
diff --git a/Makefile.dev b/Makefile.dev
diff --git a/Makefile.portable b/Makefile.portable
diff --git a/NEWS b/NEWS
diff --git a/README b/README
diff --git a/configure.ac b/configure.ac
@@ -0,0 +1,26 @@
+AC_PREREQ([2.68])
+AC_INIT([lbzip2], [1.0], [zurgunt@gmail.com])
+
+AC_CONFIG_SRCDIR(src/main.c)
+AC_CONFIG_AUX_DIR(build-aux)
+AC_CONFIG_HEADERS([lib/config.h])
+
+AM_INIT_AUTOMAKE([1.11])
+AM_SILENT_RULES([yes])
+
+AC_PROG_RANLIB
+AC_PROG_CC_C89
+gl_EARLY
+
+AC_HEADER_STDC
+AC_C_CONST
+AC_C_VOLATILE
+AC_TYPE_SIZE_T
+AC_TYPE_OFF_T
+AC_SYS_LARGEFILE
+
+gl_INIT
+
+AC_CONFIG_FILES([Makefile src/Makefile yambi/Makefile lib/Makefile
+    doc/Makefile])
+AC_OUTPUT
diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -0,0 +1 @@
+man_MANS = lbzip2.1
diff --git a/lbzip2.1 → doc/lbzip2.1 b/lbzip2.1 → doc/lbzip2.1
diff --git a/lfs.sh b/lfs.sh
diff --git a/src/Makefile.am b/src/Makefile.am
@@ -0,0 +1,7 @@
+AM_CPPFLAGS = -I$(top_srcdir)/yambi -I$(top_srcdir)/lib
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+
+bin_PROGRAMS = lbzip2
+lbzip2_SOURCES = main.c lbzip2.c lbunzip2.c lacos_rbtree.c
+lbzip2_LDADD = $(top_srcdir)/lib/libgnu.a $(top_srcdir)/yambi/libyambi.a \
+    $(LIB_PTHREAD)
diff --git a/lacos_rbtree.c → src/lacos_rbtree.c b/lacos_rbtree.c → src/lacos_rbtree.c
diff --git a/lacos_rbtree.h → src/lacos_rbtree.h b/lacos_rbtree.h → src/lacos_rbtree.h
diff --git a/lbunzip2.c → src/lbunzip2.c b/lbunzip2.c → src/lbunzip2.c
@@ -4,7 +4,7 @@
 #include <string.h>       /* memcpy() */
 #include <signal.h>       /* SIGUSR2 */
 
-#include "yambi/yambi.h"  /* YBdec_t */
+#include "yambi.h"        /* YBdec_t */
 
 #include "main.h"         /* pname */
 #include "lbunzip2.h"     /* lbunzip2() */

diff --git a/lbunzip2.h → src/lbunzip2.h b/lbunzip2.h → src/lbunzip2.h
diff --git a/lbzip2.c → src/lbzip2.c b/lbzip2.c → src/lbzip2.c
@@ -5,7 +5,7 @@
 #include <sys/time.h>     /* gettimeofday() */
 #include <unistd.h>       /* isatty() */
 
-#include "yambi/yambi.h"  /* YBenc_t */
+#include "yambi.h"        /* YBenc_t */
 
 #include "main.h"         /* pname */
 #include "lbzip2.h"       /* lbzip2() */

diff --git a/lbzip2.h → src/lbzip2.h b/lbzip2.h → src/lbzip2.h
diff --git a/main.c → src/main.c b/main.c → src/main.c
diff --git a/main.h → src/main.h b/main.h → src/main.h
diff --git a/yambi/Makefile.am b/yambi/Makefile.am
@@ -0,0 +1,6 @@
+AM_CPPFLAGS = -I$(top_srcdir)/lib
+AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS)
+
+noinst_LIBRARIES = libyambi.a
+libyambi_a_SOURCES = blocksort.c collect.c crctab.c decode.c emit.c encode.c \
+    prefix.c retrieve.c transmit.c