diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-13 18:31:42 +0000 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2006-03-13 18:31:42 +0000 |
| commit | 1c42ad8c5536e28aed1ab6a425035dfb9c4242ef (patch) | |
| tree | 476c4a279a16df41500b2899ae248a03de72171d /source/param/config.mk | |
| parent | bc03f724d2594e44b467fe6eef0857cd4b8bc7ed (diff) | |
| download | samba-1c42ad8c5536e28aed1ab6a425035dfb9c4242ef.tar.gz samba-1c42ad8c5536e28aed1ab6a425035dfb9c4242ef.tar.xz samba-1c42ad8c5536e28aed1ab6a425035dfb9c4242ef.zip | |
r14332: Built in different paths when running locally (from ./bin/) in developer
mode (./configure.developer). This will change the hardcoded value of a few
paths (BINDIR, SWATDIR, EJSDIR, SETUPDIR, DATADIR, MODULESDIR). The regular
locations will be used when running 'make install'.
This enables developers to work on (shared built) modules, swat, ejs and
setup files without having to run 'make install' each time.
Diffstat (limited to 'source/param/config.mk')
| -rw-r--r-- | source/param/config.mk | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/source/param/config.mk b/source/param/config.mk index b6e94c004c2..2304195e264 100644 --- a/source/param/config.mk +++ b/source/param/config.mk @@ -1,12 +1,12 @@ [SUBSYSTEM::CONFIG] -OBJ_FILES = ../dynconfig.o \ - loadparm.o \ - params.o \ - generic.o +OBJ_FILES = loadparm.o \ + params.o \ + generic.o \ + ../lib/version.o REQUIRED_SUBSYSTEMS = LIBBASIC PRIVATE_PROTO_HEADER = param.h -PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \ +PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \ -DBINDIR=\"$(BINDIR)\" -DLMHOSTSFILE=\"$(LMHOSTSFILE)\" \ -DLOCKDIR=\"$(LOCKDIR)\" -DPIDDIR=\"$(PIDDIR)\" -DDATADIR=\"$(DATADIR)\" \ -DLOGFILEBASE=\"$(LOGFILEBASE)\" -DSHLIBEXT=\"$(SHLIBEXT)\" \ @@ -18,3 +18,21 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DSBINDIR=\"$(SBINDIR)\" \ 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 $@ |