makefiles: Remove some obsolete rules.
This commit is contained in:
parent
08eea24b94
commit
7260277e1d
|
@ -16,7 +16,6 @@
|
||||||
INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL)
|
INCLUDES = -I$(srcdir) -I. -I$(top_srcdir)/include -I$(top_builddir)/include $(EXTRAINCL)
|
||||||
DEFS = -D__WINESRC__ $(EXTRADEFS)
|
DEFS = -D__WINESRC__ $(EXTRADEFS)
|
||||||
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
|
ALLCFLAGS = $(INCLUDES) $(DEFS) $(DLLFLAGS) $(EXTRACFLAGS) $(CPPFLAGS) $(CFLAGS) $(MODCFLAGS)
|
||||||
ALLLINTFLAGS = $(INCLUDES) $(DEFS) $(LINTFLAGS)
|
|
||||||
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
|
IDLFLAGS = $(INCLUDES) $(DEFS) $(EXTRAIDLFLAGS)
|
||||||
RCFLAGS = --nostdinc $(PORCFLAGS) $(TARGETFLAGS) $(INCLUDES) $(DEFS) $(EXTRARCFLAGS)
|
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_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)
|
$(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) \
|
CLEAN_TARGETS = $(IDL_GEN_C_SRCS) $(IDL_GEN_HEADERS) \
|
||||||
$(IDL_TLB_SRCS:.idl=.tlb) $(IDL_P_SRCS:.idl=_p.c dlldata.c) \
|
$(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)
|
$(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)
|
$(IDL_R_SRCS:.idl=_r.res) $(IDL_TLB_RES) $(RC_SRCS:.rc=.res) $(MC_SRCS:.mc=.res) $(EXTRA_OBJS)
|
||||||
|
|
||||||
CROSSOBJS = $(OBJS:.o=.cross.o)
|
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
|
# Implicit rules
|
||||||
|
|
||||||
|
@ -93,9 +86,6 @@ filter: dummy
|
||||||
.idl_t.res:
|
.idl_t.res:
|
||||||
$(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $<
|
$(WIDL) $(TARGETFLAGS) $(IDLFLAGS) -t -o $@ $<
|
||||||
|
|
||||||
.c.ln:
|
|
||||||
$(LINT) -c $(ALLLINTFLAGS) $< || ( $(RM) $@ && exit 1 )
|
|
||||||
|
|
||||||
.c.ok:
|
.c.ok:
|
||||||
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
|
$(RUNTEST) $(RUNTESTFLAGS) $< && touch $@
|
||||||
|
|
||||||
|
@ -119,26 +109,6 @@ filter: dummy
|
||||||
dlldata.c: $(WIDL) Makefile.in
|
dlldata.c: $(WIDL) Makefile.in
|
||||||
$(WIDL) $(IDLFLAGS) --dlldata-only -o $@ $(IDL_P_SRCS)
|
$(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
|
# Rules for dependencies
|
||||||
|
|
||||||
DEPEND_SRCS = $(C_SRCS) $(OBJC_SRCS) $(RC_SRCS) $(MC_SRCS) \
|
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)
|
$(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
|
# End of global rules
|
||||||
|
|
|
@ -45,8 +45,6 @@ MKDIR_P = @MKDIR_P@
|
||||||
TOOLSDIR = @TOOLSDIR@
|
TOOLSDIR = @TOOLSDIR@
|
||||||
LDFLAGS = @LDFLAGS@
|
LDFLAGS = @LDFLAGS@
|
||||||
PRELINK = @PRELINK@
|
PRELINK = @PRELINK@
|
||||||
LINT = @LINT@
|
|
||||||
LINTFLAGS = @LINTFLAGS@
|
|
||||||
FONTFORGE = @FONTFORGE@
|
FONTFORGE = @FONTFORGE@
|
||||||
RSVG = @RSVG@
|
RSVG = @RSVG@
|
||||||
CONVERT = @CONVERT@
|
CONVERT = @CONVERT@
|
||||||
|
@ -58,7 +56,6 @@ ALL_MO_FILES = $(LINGUAS:%=@top_builddir@/po/%.mo)
|
||||||
PORCFLAGS = @PORCFLAGS@
|
PORCFLAGS = @PORCFLAGS@
|
||||||
CROSSAR = $(CROSSTARGET)-ar
|
CROSSAR = $(CROSSTARGET)-ar
|
||||||
CROSSRANLIB = $(CROSSTARGET)-ranlib
|
CROSSRANLIB = $(CROSSTARGET)-ranlib
|
||||||
WINAPI_CHECK = $(top_srcdir)/tools/winapi/winapi_check
|
|
||||||
BUILDIMAGE = $(top_srcdir)/tools/buildimage
|
BUILDIMAGE = $(top_srcdir)/tools/buildimage
|
||||||
C2MAN = $(top_srcdir)/tools/c2man.pl
|
C2MAN = $(top_srcdir)/tools/c2man.pl
|
||||||
RUNTEST = $(top_srcdir)/tools/runtest
|
RUNTEST = $(top_srcdir)/tools/runtest
|
||||||
|
@ -89,5 +86,7 @@ conf_manext = 5
|
||||||
@SET_MAKE@
|
@SET_MAKE@
|
||||||
|
|
||||||
all:
|
all:
|
||||||
|
dummy:
|
||||||
|
.PHONY: all dummy
|
||||||
|
|
||||||
# End of common header
|
# End of common header
|
||||||
|
|
|
@ -35,8 +35,6 @@ INSTALLDIRS = \
|
||||||
all: wine
|
all: wine
|
||||||
@echo "Wine build complete."
|
@echo "Wine build complete."
|
||||||
|
|
||||||
WINAPI_CHECK_EXTRA_FLAGS = --global
|
|
||||||
|
|
||||||
@MAKE_RULES@
|
@MAKE_RULES@
|
||||||
|
|
||||||
# Rules for re-running configure
|
# Rules for re-running configure
|
||||||
|
|
|
@ -723,8 +723,6 @@ ICOTOOL
|
||||||
CONVERT
|
CONVERT
|
||||||
RSVG
|
RSVG
|
||||||
FONTFORGE
|
FONTFORGE
|
||||||
LINTFLAGS
|
|
||||||
LINT
|
|
||||||
INSTALL_DATA
|
INSTALL_DATA
|
||||||
INSTALL_SCRIPT
|
INSTALL_SCRIPT
|
||||||
INSTALL_PROGRAM
|
INSTALL_PROGRAM
|
||||||
|
@ -5535,54 +5533,6 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
||||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
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
|
for ac_prog in fontforge
|
||||||
do
|
do
|
||||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
|
|
|
@ -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"
|
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh"
|
||||||
AC_PROG_INSTALL
|
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
|
dnl Check for various programs
|
||||||
AC_CHECK_PROGS(FONTFORGE, fontforge, false)
|
AC_CHECK_PROGS(FONTFORGE, fontforge, false)
|
||||||
AC_CHECK_PROGS(RSVG, rsvg, false)
|
AC_CHECK_PROGS(RSVG, rsvg, false)
|
||||||
|
|
Loading…
Reference in New Issue