diff options
author | Christopher Faylor <me@cgf.cx> | 2008-10-13 03:53:26 +0400 |
---|---|---|
committer | Christopher Faylor <me@cgf.cx> | 2008-10-13 03:53:26 +0400 |
commit | 4941ce49c562e3103b7a61d8f167db6bbf98dac3 (patch) | |
tree | 98f453e52a3511b75e12920ceb357248862dd4fb /winsup/lsaauth/Makefile.in | |
parent | 12c819e204763ddb79c40dddc8361c237a9c6007 (diff) |
* Makefile.in: Rearrange to avoid -mno-cygwin.
* configure.in: Use mingw front-end from utils directory as compiler front-end.
* configure: Regenerate.
* cyglsa.c (cyglsa_printf): Rename from 'printf' to avoid a compiler error.
(print_sid, print_groups, print_privs, print_dacl, print_tokinf,
LsaApLogonUserEx): Ditto.
Diffstat (limited to 'winsup/lsaauth/Makefile.in')
-rw-r--r-- | winsup/lsaauth/Makefile.in | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/winsup/lsaauth/Makefile.in b/winsup/lsaauth/Makefile.in index 10965e0c2..c4cdccee5 100644 --- a/winsup/lsaauth/Makefile.in +++ b/winsup/lsaauth/Makefile.in @@ -29,15 +29,20 @@ INSTALL_DATA := @INSTALL_DATA@ CC := @CC@ CC_FOR_TARGET := $(CC) +override CC := @NO_CYGWIN@ $(firstword ${CC}) + CFLAGS := @CFLAGS@ include $(srcdir)/../Makefile.common -WIN32_COMMON := -mno-cygwin WIN32_INCLUDES := -I. -I$(srcdir) $(w32api_include) $(w32api_include)/ddk WIN32_CFLAGS := $(CFLAGS) $(WIN32_COMMON) $(WIN32_INCLUDES) WIN32_LDFLAGS := $(CFLAGS) $(WIN32_COMMON) -nostdlib -Wl,-shared +ifdef MINGW_CC +override CC:=${MINGW_CC} +endif + LIBS := -ladvapi32 -lkernel32 -lntdll DLL := cyglsa.dll @@ -54,12 +59,7 @@ $(DEF_FILE): cyglsa.din config.status $(SHELL) config.status $(DLL): $(OBJ) $(DEF_FILE) -ifdef VERBOSE - $(CC) -s $(WIN32_LDFLAGS) -o $@ $(DEF_FILE) $(OBJ) $(LIBS) -else - @echo $(CC) .. -o $@ $(OBJ) - @$(CC) -s $(WIN32_LDFLAGS) -o $@ $(DEF_FILE) $(OBJ) $(LIBS) -endif + $(CC) -s $(WIN32_LDFLAGS) -o $@ $^ $(LIBS) .PHONY: all install clean realclean @@ -76,10 +76,4 @@ install: all $(INSTALL_PROGRAM) $(srcdir)/cyglsa-config $(bindir)/cyglsa-config %.o: %.c -ifdef VERBOSE $(CC) $(WIN32_CFLAGS) -c -o $@ $< -else - @echo $(CC) -c $(CFLAGS) ... $(<F) - @$(CC) $(WIN32_CFLAGS) -c -o $@ $< -endif - |