diff options
| -rw-r--r-- | macros.in | 6 | ||||
| -rw-r--r-- | popt/Makefile.am | 2 | ||||
| -rw-r--r-- | popt/Makefile.in | 5 | ||||
| -rw-r--r-- | tests/macros.in | 6 |
4 files changed, 8 insertions, 11 deletions
@@ -113,8 +113,6 @@ # gotcha is that arguments, if present, should be on the same line as the # %configure. # -%configure(C:) \ - %{-C:pushd %{-C*}} \ +%configure \ %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \ - CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix} \ - %{-C:popd} + CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix} diff --git a/popt/Makefile.am b/popt/Makefile.am index c89700260..a929c908d 100644 --- a/popt/Makefile.am +++ b/popt/Makefile.am @@ -13,7 +13,7 @@ noinst_INCLUDES = findme.h poptint.h noinst_PROGRAMS = test1 test1_SOURCES = test1.c -test1_LDADD = -lpopt +test1_LDADD = $(lib_LTLIBRARIES) include_HEADERS = popt.h lib_LTLIBRARIES = libpopt.la diff --git a/popt/Makefile.in b/popt/Makefile.in index 885680abc..c2d52e3fc 100644 --- a/popt/Makefile.in +++ b/popt/Makefile.in @@ -89,7 +89,7 @@ noinst_INCLUDES = findme.h poptint.h noinst_PROGRAMS = test1 test1_SOURCES = test1.c -test1_LDADD = -lpopt +test1_LDADD = $(lib_LTLIBRARIES) include_HEADERS = popt.h lib_LTLIBRARIES = libpopt.la @@ -106,6 +106,7 @@ LTLIBRARIES = $(lib_LTLIBRARIES) DEFS = @DEFS@ -I. -I$(srcdir) -I. CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ libpopt_la_LDFLAGS = libpopt_la_LIBADD = @@ -114,7 +115,7 @@ popthelp.lo PROGRAMS = $(noinst_PROGRAMS) test1_OBJECTS = test1.o -test1_DEPENDENCIES = +test1_DEPENDENCIES = libpopt.la test1_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/tests/macros.in b/tests/macros.in index dfcdd4995..e44952879 100644 --- a/tests/macros.in +++ b/tests/macros.in @@ -113,8 +113,6 @@ # gotcha is that arguments, if present, should be on the same line as the # %configure. # -%configure(C:) \ - %{-C:pushd %{-C*}} \ +%configure \ %{?__libtoolize:[ -f configure.in ] && %{__libtoolize} --copy --force} \ - CFLAGS="%{optflags}" ./configure %{_build} --prefix=%{_prefix} \ - %{-C:popd} + CFLAGS="%{optflags}" ./configure %{_target} --prefix=%{_prefix} |