diff options
-rw-r--r-- | Makefile.am | 8 | ||||
-rw-r--r-- | check/Makefile.am | 2 | ||||
-rw-r--r-- | popt/Makefile.am | 4 | ||||
-rw-r--r-- | popt/findme.c (renamed from findme.c) | 0 | ||||
-rw-r--r-- | popt/findme.h (renamed from findme.h) | 0 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index 17a85c1..875e01f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ included_glib_includes = @GLIB_CFLAGS@ pkg_config_LDADD=@GLIB_LIBS@ else GLIB_SUBDIR = glib-1.2.10 -included_glib_includes = -I./glib-1.2.10 +included_glib_includes = -I$(top_srcdir)/glib-1.2.10 -I$(top_builddir)/glib-1.2.10 pkg_config_LDADD=glib-1.2.10/libglib.la endif @@ -11,7 +11,7 @@ if USE_INSTALLED_POPT pkg_config_LDADD += $(POPT_LIBS) else pkg_config_LDADD += popt/libpopt.la -popt_includes = -I./popt +popt_includes = -I$(top_srcdir)/popt POPT_SUBDIR = popt endif @@ -36,6 +36,4 @@ pkg_config_SOURCES= \ pkg.c \ parse.h \ parse.c \ - main.c \ - findme.c \ - findme.h + main.c
\ No newline at end of file diff --git a/check/Makefile.am b/check/Makefile.am index 39ba7c8..87888fa 100644 --- a/check/Makefile.am +++ b/check/Makefile.am @@ -5,6 +5,6 @@ TESTS = check-cflags check-libs check-define-variable \ EXTRA_DIST = $(TESTS) common simple.pc requires-test.pc public-dep.pc \ private-dep.pc includedir.pc missing-requires-private.pc \ - missing-requires.pc idirafter.pc whitespace.pc + missing-requires.pc idirafter.pc conflicts-test.pc whitespace.pc DISTCLEANFILES = config.sh diff --git a/popt/Makefile.am b/popt/Makefile.am index b11c12a..02c0ad9 100644 --- a/popt/Makefile.am +++ b/popt/Makefile.am @@ -5,4 +5,6 @@ libpopt_la_SOURCES = \ poptconfig.c \ popthelp.c \ poptint.h \ - poptparse.c + poptparse.c \ + findme.c \ + findme.h |