Move sources to src/ subdirectory

Makefile.am

@@ -2,32 +2,13 @@
 
 MCCABE =	pmccabe
 
-EXTRA_DIST = lookup3.c autogen.sh CHANGES $(man_MANS) ci/Dockerfile \
-	libpopt.vers
+EXTRA_DIST = autogen.sh CHANGES $(man_MANS) ci/Dockerfile
 
-SUBDIRS = po . auto tests
-
-AM_CPPFLAGS = -I. -I$(top_srcdir)
-AM_CPPFLAGS += -DPOPT_SYSCONFDIR="\"$(sysconfdir)\""
-
-noinst_HEADERS = poptint.h system.h
-
-include_HEADERS = popt.h
-lib_LTLIBRARIES = libpopt.la
-
-libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
-
-libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
-# libtool current:revision:age info
-libpopt_la_LDFLAGS += -version-info 0:0:0
+SUBDIRS = src po auto tests
 
 pkgconfigdir = $(prefix)/lib/pkgconfig
 pkgconfig_DATA = popt.pc
 
-if HAVE_LD_VERSION_SCRIPT
-libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers
-endif
-
 man_MANS = popt.3
 
 BUILT_SOURCES = popt.pc # popt.lcd

configure.ac

@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 AC_INIT(popt, 1.16, rpm-maint@lists.rpm.org)
-AC_CONFIG_SRCDIR([popt.h])
+AC_CONFIG_SRCDIR([src/popt.h])
 AC_CONFIG_HEADERS([config.h])
 
 dnl Must come before AM_INIT_AUTOMAKE.
@@ -58,7 +58,7 @@ AM_ICONV_LINK
 
 AC_CONFIG_SUBDIRS()
 AC_CONFIG_FILES([ po/Makefile.in
-    Doxyfile Makefile popt.pc tests/test-poptrc tests/Makefile
+    Doxyfile Makefile src/Makefile popt.pc tests/test-poptrc tests/Makefile
     auto/Makefile auto/desc auto/types
 ])
 AC_OUTPUT

po/POTFILES.in

@@ -2,9 +2,9 @@
 
 # Package source files
 
-popt.c
-popt.h
-poptconfig.c
-popthelp.c
-poptint.c
-poptparse.c
+src/popt.c
+src/popt.h
+src/poptconfig.c
+src/popthelp.c
+src/poptint.c
+src/poptparse.c

src/Makefile.am

@@ -0,0 +1,22 @@
+# Makefile for popt library.
+
+EXTRA_DIST = lookup3.c libpopt.vers
+
+AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS += -DPOPT_SYSCONFDIR="\"$(sysconfdir)\""
+
+noinst_HEADERS = poptint.h system.h
+
+include_HEADERS = popt.h
+lib_LTLIBRARIES = libpopt.la
+
+libpopt_la_SOURCES = popt.c poptparse.c poptconfig.c popthelp.c poptint.c
+
+libpopt_la_LDFLAGS = -no-undefined @LTLIBINTL@ @LTLIBICONV@
+# libtool current:revision:age info
+libpopt_la_LDFLAGS += -version-info 0:0:0
+
+if HAVE_LD_VERSION_SCRIPT
+libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/src/libpopt.vers
+endif
+

tests/Makefile.am

@@ -2,21 +2,21 @@
 
 EXTRA_DIST = testit.sh test-poptrc
 
-AM_CPPFLAGS = -I. -I$(top_srcdir)
+AM_CPPFLAGS = -I. -I$(top_srcdir)/src
 
 noinst_PROGRAMS = test1 test2 tdict # test3
 test1_SOURCES = test1.c
 test1_LDFLAGS = 
-test1_LDADD = $(top_builddir)/libpopt.la
+test1_LDADD = $(top_builddir)/src/libpopt.la
 test2_SOURCES = test2.c
 test2_LDFLAGS = 
-test2_LDADD = $(top_builddir)/libpopt.la
+test2_LDADD = $(top_builddir)/src/libpopt.la
 #test3_SOURCES = test3.c
 #test3_LDFLAGS = 
-#ltest3_LDADD = $(top_builddir)/libpopt.la
+#ltest3_LDADD = $(top_builddir)/src/libpopt.la
 tdict_SOURCES = tdict.c
 tdict_LDFLAGS = 
-tdict_LDADD = $(top_builddir)/libpopt.la
+tdict_LDADD = $(top_builddir)/src/libpopt.la
 
 noinst_SCRIPTS = testit.sh