summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-09 09:16:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:18:04 -0500
commitbf4a32b73aa2d9eeca47a8b6ed9cf5b1e9c6f287 (patch)
tree0eb147c6f865db1825510e4af6edb7c364048247
parentbb21503c431e7a006125b1573f81e88c28707153 (diff)
downloadsamba-bf4a32b73aa2d9eeca47a8b6ed9cf5b1e9c6f287.tar.gz
samba-bf4a32b73aa2d9eeca47a8b6ed9cf5b1e9c6f287.tar.bz2
samba-bf4a32b73aa2d9eeca47a8b6ed9cf5b1e9c6f287.zip
r18297: - remove leading ./
- add CFLAGS to the dynconfig-devel.o rule metze (This used to be commit d9401b1f41bde8fff556eeeac78eefb48551e2f2)
-rw-r--r--source4/dynconfig.mk6
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/dynconfig.mk b/source4/dynconfig.mk
index 456c65d5e7..2743bc2b29 100644
--- a/source4/dynconfig.mk
+++ b/source4/dynconfig.mk
@@ -12,7 +12,7 @@ PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" \
-DMODULESDIR=\"$(MODULESDIR)\" -DJSDIR=\"$(JSDIR)\" \
-DSETUPDIR=\"$(SETUPDIR)\" -DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
-./dynconfig.o: dynconfig.c Makefile
+dynconfig.o: dynconfig.c Makefile
@echo Compiling $<
@$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) $(PATH_FLAGS) -c $< -o $@
@@ -30,6 +30,6 @@ DEVEL_PATH_FLAGS = -DCONFIGFILE=\"$(CONFIGFILE)\" -DBINDIR=\"$(builddir)/bin\" \
-DSETUPDIR=\"$(srcdir)/setup\" \
-DWINBINDD_SOCKET_DIR=\"$(WINBINDD_SOCKET_DIR)\"
-./dynconfig-devel.o: dynconfig.c Makefile
+dynconfig-devel.o: dynconfig.c Makefile
@echo Compiling $<
- @$(CC) $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@
+ @$(CC) `$(PERL) $(srcdir)/script/cflags.pl $@` $(CFLAGS) $(PICFLAG) $(DEVEL_PATH_FLAGS) -c $< -o $@