Add packaging

[platform/upstream/libtsm.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 67a72d8..2c5388b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@
 # Library Version Numbers
 #
 
-LIBTSM_CURRENT = 1
+LIBTSM_CURRENT = 3
 LIBTSM_REVISION = 0
 LIBTSM_AGE = 0
 
@@ -30,6 +30,7 @@ include_HEADERS =
 EXTRA_DIST = \
        README \
        COPYING \
+       LICENSE_htable \
        NEWS \
        docs/libtsm.pc.in \
        docs/libtsm.sym
@@ -38,6 +39,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =
 TPHONY =
 
+TESTS =
 check_PROGRAMS =
 lib_LTLIBRARIES =
 noinst_LTLIBRARIES =
@@ -63,8 +65,7 @@ AM_CFLAGS = \
        -fno-strict-aliasing \
        -fvisibility=hidden \
        -ffunction-sections \
-       -fdata-sections \
-       -fstack-protector
+       -fdata-sections
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
        -I $(srcdir)/src
@@ -93,14 +94,10 @@ endif
 noinst_LTLIBRARIES += libshl.la
 
 libshl_la_SOURCES = \
-       src/shl_dlist.h \
        src/shl_array.h \
-       src/shl_hashtable.h \
-       external/htable.h \
-       external/htable.c \
-       src/shl_timer.h \
-       src/shl_llog.h \
-       src/shl_misc.h
+       src/shl_htable.h \
+       src/shl_htable.c \
+       src/shl_llog.h
 libshl_la_CPPFLAGS = $(AM_CPPFLAGS)
 libshl_la_LDFLAGS = $(AM_LDFLAGS)
 libshl_la_LIBADD = $(AM_LIBADD)
@@ -111,24 +108,19 @@ libshl_la_LIBADD = $(AM_LIBADD)
 #
 
 lib_LTLIBRARIES += libtsm.la
-include_HEADERS += \
-       src/tsm_screen.h \
-       src/tsm_unicode.h \
-       src/tsm_vte.h \
-       src/libtsm.h
+include_HEADERS += src/libtsm.h
 pkgconfig_DATA += docs/libtsm.pc
 
 libtsm_la_SOURCES = \
        src/libtsm.h \
-       src/tsm_unicode.h \
+       src/libtsm_int.h \
        src/tsm_unicode.c \
-       src/tsm_screen.h \
        src/tsm_screen.c \
-       src/tsm_vte.h \
        src/tsm_vte.c \
        src/tsm_vte_charsets.c \
        external/wcwidth.h \
-       external/wcwidth.c
+       external/wcwidth.c \
+       external/xkbcommon-keysyms.h
 
 libtsm_la_CPPFLAGS = $(AM_CPPFLAGS)
 libtsm_la_LIBADD = libshl.la
@@ -143,6 +135,33 @@ libtsm_la_CPPFLAGS += $(XKBCOMMON_CFLAGS)
 endif
 
 #
+# Tests
+#
+
+if BUILD_HAVE_CHECK
+check_PROGRAMS += \
+       test_htable
+TESTS += \
+       test_htable
+endif
+
+test_sources = \
+       test/test_common.h
+test_libs = \
+       libshl.la \
+       $(CHECK_LIBS)
+test_cflags = \
+       $(AM_CPPFLAGS) \
+       $(CHECK_CFLAGS)
+test_lflags = \
+       $(AM_LDFLAGS)
+
+test_htable_SOURCES = test/test_htable.c $(test_sources)
+test_htable_CPPFLAGS = $(test_cflags)
+test_htable_LDADD = $(test_libs)
+test_htable_LDFLAGS = $(test_lflags)
+
+#
 # Phony targets
 #