summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExplorer09 <explorer09@gmail.com>2017-08-27 00:17:57 +0800
committerExplorer09 <explorer09@gmail.com>2017-08-27 00:17:57 +0800
commit7e06407175ed235378624d8b75aa24179a27b876 (patch)
tree31920fe86b505f3ee67fcfef83aea2a5783fc00f
parent931d29bdeacc66f561e44636f80f33782ca4bbb0 (diff)
Move libfl.pc.in to src subdirectory.
-rw-r--r--.gitignore1
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac2
-rw-r--r--src/.gitignore1
-rw-r--r--src/Makefile.am3
-rw-r--r--src/libfl.pc.in (renamed from libfl.pc.in)0
6 files changed, 5 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 53d0c18..e92979c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,6 @@ config.status
configure
configure.scan
flex-*/
-libfl.pc
libtool
m4/
stamp-*
diff --git a/Makefile.am b/Makefile.am
index e790e9d..638c549 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -49,9 +49,6 @@ SUBDIRS = \
tests \
tools
-pkgconfigdir = @pkgconfigdir@
-pkgconfig_DATA = libfl.pc
-
# Create the ChangeLog, but only if we're inside a git working directory
ChangeLog: $(srcdir)/tools/git2cl
diff --git a/configure.ac b/configure.ac
index 8882016..c6f12d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,10 +180,10 @@ examples/Makefile
examples/fastwc/Makefile
examples/manual/Makefile
po/Makefile.in
+src/libfl.pc
src/Makefile
tools/Makefile
tests/Makefile
-libfl.pc
)
AC_OUTPUT
diff --git a/src/.gitignore b/src/.gitignore
index 1daa9f8..7f35139 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -4,6 +4,7 @@
config.h
config.h.in
flex
+libfl.pc
parse.c
parse.h
scan.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d13a5a..2181127 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,6 +9,9 @@ if ENABLE_BOOTSTRAP
noinst_PROGRAMS = stage1flex
endif
+pkgconfigdir = @pkgconfigdir@
+pkgconfig_DATA = libfl.pc
+
if ENABLE_LIBFL
lib_LTLIBRARIES = libfl.la
endif
diff --git a/libfl.pc.in b/src/libfl.pc.in
index 058c089..058c089 100644
--- a/libfl.pc.in
+++ b/src/libfl.pc.in