Make common a static library

authselect · Aug 15, 2017 · d4f78dc · d4f78dc
1 parent 7f66237
commit d4f78dc
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/src/cli/Makefile.am b/src/cli/Makefile.am
@@ -14,13 +14,11 @@ dist_noinst_HEADERS = \
     $(NULL)
 
 authselect_SOURCES = \
-    ../common/malloc.c \
-    ../common/debug.c \
-    ../common/utils.c \
     cli_tool.c \
     main.c \
     $(NULL)
 authselect_LDADD = \
+    $(top_builddir)/src/common/libcommon.la \
     $(top_builddir)/src/lib/libauthselect.la \
     $(POPT_LIBS) \
     $(NULL)

diff --git a/src/common/Makefile.am b/src/common/Makefile.am
@@ -1,4 +1,23 @@
+AM_CFLAGS = \
+    -I$(top_srcdir)/include \
+    -I$(top_srcdir)/src/common \
+    -ggdb3 \
+    $(NULL)
+
 dist_noinst_HEADERS = \
     common.h \
     gettext.h \
     $(NULL)
+
+noinst_LTLIBRARIES = \
+    libcommon.la \
+    $(NULL)
+
+libcommon_la_SOURCES = \
+    malloc.c \
+    debug.c \
+    utils.c \
+    $(NULL)
+libcommon_la_CFLAGS = \
+    $(AM_CFLAGS) \
+    $(NULL)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
@@ -28,9 +28,6 @@ authselect_nsswitch_conf=@AUTHSELECT_NSSWITCH_CONF@
 authselect_dconf_file=@AUTHSELECT_DCONF_FILE@
 
 libauthselect_la_SOURCES = \
-    ../common/malloc.c \
-    ../common/debug.c \
-    ../common/utils.c \
     authselect.c \
     authselect_dir.c \
     authselect_profile.c \
@@ -40,6 +37,9 @@ libauthselect_la_SOURCES = \
     authselect_activate.c \
     authselect_util.c \
     $(NULL)
+libauthselect_la_LIBADD = \
+    $(top_builddir)/src/common/libcommon.la \
+    $(NULL)
 libauthselect_la_CFLAGS = \
     $(AM_CFLAGS) \
     -DAUTHSELECT_CONFIG_DIR=\"$(authselect_config_dir)\" \