diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-17 01:38:14 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:34 -0500 |
| commit | 36b56d64b282a41ccc2ca4ea67ebb8bbc3d530fc (patch) | |
| tree | df6e6883eb5b5cd530245ff46a90565960cfba2f /source4/param | |
| parent | 2d558d5e195bc35f7af2bd1d2150bf9882d0cc24 (diff) | |
| download | samba-36b56d64b282a41ccc2ca4ea67ebb8bbc3d530fc.tar.gz samba-36b56d64b282a41ccc2ca4ea67ebb8bbc3d530fc.tar.bz2 samba-36b56d64b282a41ccc2ca4ea67ebb8bbc3d530fc.zip | |
r14499: Remove dynconfig hack for now - it caused a recompile of the
asn1 compiler every time a .mk file changed, thus causing the
recompilation of the files generated from ASN1.
(This used to be commit 4cd1e017e335818ef4585ff1096cb9968d14399f)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/config.mk | 31 |
1 files changed, 1 insertions, 30 deletions
diff --git a/source4/param/config.mk b/source4/param/config.mk index af7b98f23e..d88d0765e7 100644 --- a/source4/param/config.mk +++ b/source4/param/config.mk @@ -3,36 +3,7 @@ OBJ_FILES = loadparm.o \ params.o \ generic.o \ ../lib/version.o -REQUIRED_SUBSYSTEMS = LIBBASIC +REQUIRED_SUBSYSTEMS = LIBBASIC DYNCONFIG PRIVATE_PROTO_HEADER = proto.h -PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \ - -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \ - -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \ - -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \ - -DCONFIGDIR=\"$(CONFIGDIR)\" -DNCALRPCDIR=\"$(NCALRPCDIR)\" \ - -DSWATDIR=\"$(SWATDIR)\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \ - -DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \ - -DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" -dynconfig.o: dynconfig.c Makefile - @echo Compiling $< - @$(CC) $(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\" -DPRIVATE_DIR=\"$(PRIVATEDIR)\" \ - -DMODULESDIR=\"$(builddir)/bin/modules\" \ - -DJSDIR=\"$(srcdir)/scripting/libjs\" \ - -DSETUPDIR=\"$(srcdir)/setup\" \ - -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\" - -dynconfig-devel.o: dynconfig.c Makefile - @echo Compiling $< - @$(CC) $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@ |