diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 19:00:46 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-17 19:00:46 +0200 |
| commit | 87e4e0e9406a4805c0116652b2ea34114acc279a (patch) | |
| tree | cdc67a526490daed41730599dd55bad052fdee4d /source3/lib/netapi/tests | |
| parent | 661d25402ecb36a35bee6b282440854f5280781a (diff) | |
| parent | f4293618a712ca7ce59b7d695e2e3d918ddbb542 (diff) | |
| download | samba-87e4e0e9406a4805c0116652b2ea34114acc279a.tar.gz samba-87e4e0e9406a4805c0116652b2ea34114acc279a.tar.bz2 samba-87e4e0e9406a4805c0116652b2ea34114acc279a.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
Conflicts:
source3/Makefile.in
Diffstat (limited to 'source3/lib/netapi/tests')
| -rw-r--r-- | source3/lib/netapi/tests/Makefile.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/lib/netapi/tests/Makefile.in b/source3/lib/netapi/tests/Makefile.in index d3f0663908..0145753212 100644 --- a/source3/lib/netapi/tests/Makefile.in +++ b/source3/lib/netapi/tests/Makefile.in @@ -2,7 +2,7 @@ KRB5LIBS=@KRB5_LIBS@ LDAP_LIBS=@LDAP_LIBS@ LIBS=@LIBS@ -lnetapi -ltdb -ltalloc DEVELOPER_CFLAGS=@DEVELOPER_CFLAGS@ -FLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS) +CCFLAGS=-I../ -L../../../bin @CFLAGS@ $(GTK_FLAGS) CC=@CC@ PICFLAG=@PICFLAG@ LDFLAGS=@PIE_LDFLAGS@ @LDFLAGS@ @@ -11,7 +11,7 @@ NETAPI_LIBS=$(LIBS) $(KRB5LIBS) $(LDAP_LIBS) CMDLINE_LIBS=$(NETAPI_LIBS) @POPTLIBS@ # Compile a source file. -COMPILE_CC = $(CC) -I. $(FLAGS) $(PICFLAG) -c $< -o $@ +COMPILE_CC = $(CC) -I. $(CCFLAGS) $(PICFLAG) -c $< -o $@ COMPILE = $(COMPILE_CC) PROGS = bin/netapitest@EXEEXT@ @@ -48,7 +48,7 @@ NETAPITEST_OBJ = netapitest.o netlocalgroup.o netuser.o netgroup.o netdisplay.o bin/netapitest@EXEEXT@: $(BINARY_PREREQS) $(NETAPITEST_OBJ) @echo Linking $@ - @$(CC) $(FLAGS) -o $@ $(NETAPITEST_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS) + @$(CC) $(CCFLAGS) -o $@ $(NETAPITEST_OBJ) $(LDFLAGS) $(DYNEXP) $(CMDLINE_LIBS) clean: -rm -f $(PROGS) |