diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-10-25 14:58:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:24:39 -0500 |
| commit | bc596cf917a25569f71d7d2b72ba11f3cb34dd54 (patch) | |
| tree | e91562b93162903a6c1c3925d966f6226d49f6bb /source4/dynconfig.mk | |
| parent | f8afc52ed0125e15d1ea05e79a0f86077dc92ddd (diff) | |
| download | samba-bc596cf917a25569f71d7d2b72ba11f3cb34dd54.tar.gz samba-bc596cf917a25569f71d7d2b72ba11f3cb34dd54.tar.xz samba-bc596cf917a25569f71d7d2b72ba11f3cb34dd54.zip | |
r19495: Stop linking binaries twice (once before installation, once during build).
Make TORTURE-TALLOC and TORTURE-REPLACE builtin again rather than
separate binaries.
(This used to be commit 8913d60c72a67b041b08d569c9bd048953106c85)
Diffstat (limited to 'source4/dynconfig.mk')
| -rw-r--r-- | source4/dynconfig.mk | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk index ed901a838da..c17e2638ada 100644 --- a/source4/dynconfig.mk +++ b/source4/dynconfig.mk @@ -17,23 +17,3 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \ dynconfig.o: dynconfig.c Makefile @echo Compiling $< @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@ - -# dynconfig defines used for binaries in bin/, when configure ran in developer -# mode: - -DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \ - -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" -DLOCKDIR=\"$(LOCKDIR)\" \ - -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(srcdir)/codepages\" \ - -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \ - -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \ - -DSWATDIR=\"$(srcdir)/../../swat\" \ - -DSERVICESDIR=\"$(srcdir)/../../services\"\ - -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \ - -DMODULESDIR=\"$(builddir)/bin/modules\" \ - -DJSDIR=\"$(srcdir)/../scripting/libjs\" \ - -DSETUPDIR=\"$(srcdir)/setup\" -DTORTUREDIR=\"$(srcdir)/bin/torture\" \ - -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" - -dynconfig-devel.o: dynconfig.c Makefile - @echo Compiling $< - @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` -Ilib/replace $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@ |