Alexandre Julliard : makefiles: Remove some obsolete rules.
Alexandre Julliard
julliard at winehq.org
Tue Oct 8 15:41:05 CDT 2013
Module: wine
Branch: master
Commit: 7260277e1db30d574161a10b8c19b765f0047955
URL: http://source.winehq.org/git/wine.git/?a=commit;h=7260277e1db30d574161a10b8c19b765f0047955
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Oct 8 10:18:56 2013 +0200
makefiles: Remove some obsolete rules.
---
Make.rules.in | 36 +-----------------------------------
Make.vars.in | 5 ++---
Makefile.in | 2 --
configure | 50 --------------------------------------------------
configure.ac | 9 ---------
5 files changed, 3 insertions(+), 99 deletions(-)
diff --git a/Make.rules.in b/Make.rules.in
index aeb605b..db3a45f 100644
--- a/Make.rules.in
+++ b/Make.rules.in
@@ -16,7 +16,6 @@
INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL)
DEFS = -D__WINESRC__ $(EXTRADEFS)
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
-ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
@@ -25,7 +24,7 @@ IDL_GEN_C_SRCS = $(IDL_C_SRCS:.idl=_c.c) $(IDL_I_SRCS:.idl=_i.c) \
IDL_GEN_HEADERS = $(IDL_H_SRCS:.idl=.h) $(IDL_C_SRCS:.idl=.h) $(IDL_I_SRCS:.idl=.h) \
$(IDL_P_SRCS:.idl=.h) $(IDL_S_SRCS:.idl=.h)
-CLEAN_FILES = *.o *.a *.so *.mo *.ln *.res *.fake *.ok *.tab.[ch] *.yy.c
+CLEAN_FILES = *.o *.a *.so *.mo *.res *.fake *.ok *.tab.[ch] *.yy.c
CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \
$(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \
$(PO_SRCS:.rc=.res rsrc.pot) $(MC_SRCS:.mc=.res msg.pot) $(XTEMPLATE_SRCS:.x=.h)
@@ -34,12 +33,6 @@ OBJS = $(C_SRCS:.c=.o) $(BISON_SRCS:.y=.tab.o) $(LEX_SRCS:.l=.yy.o) $(IDL_GEN_C_
$(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
CROSSOBJS = $(OBJS:.o=.cross.o)
-LINTS = $(C_SRCS:.c=.ln)
-
-filter: dummy
- @$(top_srcdir)/tools/winapi/make_filter --make $(MAKE) all
-
-.PHONY: all filter
# Implicit rules
@@ -93,9 +86,6 @@ filter: dummy
.idl_t.res:
$(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $<
-.c.ln:
- $(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
-
.c.ok:
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
@@ -119,26 +109,6 @@ filter: dummy
dlldata.c: $(WIDL) Makefile.in
$(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS)
-# Rule for linting
-
-$(MODULE).ln : $(LINTS)
- if test "$(LINTS)" ; \
- then \
- $(LINT) $(ALLLINTFLAGS) -o$(MODULE) $(LINTS) ; \
- $(MV) llib-l$(MODULE).ln $(MODULE).ln ; \
- else \
- $(LINT) $(ALLLINTFLAGS) -C$(MODULE) /dev/null ; \
- fi
-
-lint:: $(MODULE).ln
-
-# Rules for Windows API checking
-
-winapi_check:: dummy
- $(WINAPI_CHECK) $(WINAPI_CHECK_FLAGS) $(WINAPI_CHECK_EXTRA_FLAGS) .
-
-.PHONY: winapi_check
-
# Rules for dependencies
DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \
@@ -200,8 +170,4 @@ $(PO_SRCS:.rc=.res): $(ALL_MO_FILES)
$(IDL_GEN_HEADERS) $(IDL_GEN_C_SRCS) $(IDL_TLB_SRCS:.idl=.tlb) $(IDL_TLB_RES) $(IDL_R_SRCS:.idl=_r.res): $(WIDL)
-dummy:
-
-.PHONY: dummy
-
# End of global rules
diff --git a/Make.vars.in b/Make.vars.in
index b5cca68..570009e 100644
--- a/Make.vars.in
+++ b/Make.vars.in
@@ -45,8 +45,6 @@ MKDIR_P = @MKDIR_P@
TOOLSDIR = @TOOLSDIR@
LDFLAGS = @LDFLAGS@
PRELINK = @PRELINK@
-LINT = @LINT@
-LINTFLAGS = @LINTFLAGS@
FONTFORGE = @FONTFORGE@
RSVG = @RSVG@
CONVERT = @CONVERT@
@@ -58,7 +56,6 @@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo)
PORCFLAGS = @PORCFLAGS@
CROSSAR = $(CROSSTARGET)-ar
CROSSRANLIB = $(CROSSTARGET)-ranlib
-WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check
BUILDIMAGE = $(top_srcdir)/tools/buildimage
C2MAN = $(top_srcdir)/tools/c2man.pl
RUNTEST = $(top_srcdir)/tools/runtest
@@ -89,5 +86,7 @@ conf_manext = 5
@SET_MAKE@
all:
+dummy:
+.PHONY: all dummy
# End of common header
diff --git a/Makefile.in b/Makefile.in
index a07abd2..7635612 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,6 @@ INSTALLDIRS = \
all: wine
@echo "Wine build complete."
-WINAPI_CHECK_EXTRA_FLAGS = --global
-
@MAKE_RULES@
# Rules for re-running configure
diff --git a/configure b/configure
index 602eaca..b022253 100755
--- a/configure
+++ b/configure
@@ -723,8 +723,6 @@ ICOTOOL
CONVERT
RSVG
FONTFORGE
-LINTFLAGS
-LINT
INSTALL_DATA
INSTALL_SCRIPT
INSTALL_PROGRAM
@@ -5535,54 +5533,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-for ac_prog in lclint lint
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_LINT+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- if test -n "$LINT"; then
- ac_cv_prog_LINT="$LINT" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_prog_LINT="$ac_prog"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
-fi
-fi
-LINT=$ac_cv_prog_LINT
-if test -n "$LINT"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINT" >&5
-$as_echo "$LINT" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
- test -n "$LINT" && break
-done
-
-if test "$LINT" = "lint"
-then
- LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4"
- fi
-
-
for ac_prog in fontforge
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/configure.ac b/configure.ac
index fc4f096..f407355 100644
--- a/configure.ac
+++ b/configure.ac
@@ -268,15 +268,6 @@ dnl Use the correct strip to install programs
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh"
AC_PROG_INSTALL
-dnl Check for lint
-AC_CHECK_PROGS(LINT, lclint lint)
-if test "$LINT" = "lint"
-then
- LINTFLAGS="$LINTFLAGS -errchk=%all,no%longptr64 -errhdr=%user -Ncheck=macro -Nlevel=4"
- dnl LINTFLAGS='-D_SIZE_T "-Dsize_t=unsigned long" -errchk=longptr64'
-fi
-AC_SUBST(LINTFLAGS)
-
dnl Check for various programs
AC_CHECK_PROGS(FONTFORGE, fontforge, false)
AC_CHECK_PROGS(RSVG, rsvg, false)
More information about the wine-cvs
mailing list