diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2005-12-26 18:03:50 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:47:45 -0500 |
| commit | d8e35f882879e189f55b3bca818dd44cc5f0c6fa (patch) | |
| tree | e9a9696ef8406b06cdaa2dee0dfcc2d01d594d76 /source4/lib/popt | |
| parent | 448483199fb436309735f5203b3282fca2c517ec (diff) | |
| download | samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.gz samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.tar.bz2 samba-d8e35f882879e189f55b3bca818dd44cc5f0c6fa.zip | |
r12498: Eliminate INIT_OBJ_FILES and ADD_OBJ_FILES. We were not using
the difference between these at all, and in the future the
fact that INIT_OBJ_FILES include smb_build.h will be sufficient to
have recompiles at the right time.
(This used to be commit b24f2583edee38abafa58578d8b5c4b43e517def)
Diffstat (limited to 'source4/lib/popt')
| -rw-r--r-- | source4/lib/popt/config.m4 | 4 | ||||
| -rw-r--r-- | source4/lib/popt/config.mk | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 index 227c9a1237..0eca06ceed 100644 --- a/source4/lib/popt/config.m4 +++ b/source4/lib/popt/config.m4 @@ -26,12 +26,12 @@ fi AC_MSG_CHECKING(whether to use included popt) if test x"$INCLUDED_POPT" != x"no"; then CPPFLAGS="$CPPFLAGS -I$srcdir/lib/popt" - SMB_SUBSYSTEM(LIBPOPT,[], + SMB_SUBSYSTEM(LIBPOPT, [], [INT_LIB_POPT]) AC_MSG_RESULT(yes) else - SMB_SUBSYSTEM(LIBPOPT,[], + SMB_SUBSYSTEM(LIBPOPT, [], [EXT_LIB_POPT]) SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk index 9140716b47..f65831bbed 100644 --- a/source4/lib/popt/config.mk +++ b/source4/lib/popt/config.mk @@ -1,7 +1,7 @@ ############################## # Start SUBSYSTEM INT_LIB_POPT [SUBSYSTEM::INT_LIB_POPT] -ADD_OBJ_FILES = findme.o \ +OBJ_FILES = findme.o \ popt.o \ poptconfig.o \ popthelp.o \ |