diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-03-13 18:31:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:57:12 -0500 |
| commit | e47f76e96dde0ab53a51a6cd66372eafa2b1385d (patch) | |
| tree | 233c4ed557e33f9cd227ac0c35f22872cd0c4852 /source4/param | |
| parent | e153a8099e9a187e6bcac6507ed4b1ddfe7cb764 (diff) | |
| download | samba-e47f76e96dde0ab53a51a6cd66372eafa2b1385d.tar.gz samba-e47f76e96dde0ab53a51a6cd66372eafa2b1385d.tar.bz2 samba-e47f76e96dde0ab53a51a6cd66372eafa2b1385d.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.
(This used to be commit f12c1ee19349e17dc5d109ccc71b5374796a6e23)
Diffstat (limited to 'source4/param')
| -rw-r--r-- | source4/param/config.mk | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/source4/param/config.mk b/source4/param/config.mk index b6e94c004c..2304195e26 100644 --- a/source4/param/config.mk +++ b/source4/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 $@ |