From e0c6370c75de78c860daf3a81fdd0ce7f20bc822 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Sat, 30 Nov 2002 19:19:44 +0000
Subject: [PATCH] Removed some checklink rules made unnecessary by the -z defs
 linker flag.

---
 dlls/Makedll.rules.in         | 3 +--
 dlls/Maketest.rules.in        | 7 -------
 programs/Makefile.in          | 2 --
 programs/Makeprog.rules.in    | 7 -------
 programs/avitools/Makefile.in | 9 ---------
 5 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/dlls/Makedll.rules.in b/dlls/Makedll.rules.in
index 7463b10b0c7..d18ebe7275a 100644
--- a/dlls/Makedll.rules.in
+++ b/dlls/Makedll.rules.in
@@ -57,8 +57,7 @@ $(WIN16_FILES:%=__checklink16__%): checklink16
 checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy
 	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o -L$(DLLDIR) $(LDIMPORTS:%=-l%) $(ALL_LIBS) && $(RM) checklink
 
-checklink:: $(MODULE)$(DLLEXT) $(SUBDIRS:%=%/__checklink__) $(WIN16_FILES:%=__checklink16__%)
-	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE)$(DLLEXT) && $(RM) checklink
+checklink:: $(WIN16_FILES:%=__checklink16__%)
 
 # Rules for testing
 
diff --git a/dlls/Maketest.rules.in b/dlls/Maketest.rules.in
index da7c313fb99..e15314e6d60 100644
--- a/dlls/Maketest.rules.in
+++ b/dlls/Maketest.rules.in
@@ -47,13 +47,6 @@ $(MODULE): $(OBJS) $(RCOBJS) Makefile.in
 $(TESTLIST): Makefile.in
 	$(TOPSRCDIR)/tools/make_ctests $(CTESTS) >$(TESTLIST) || $(RM) $(TESTLIST)
 
-# Rules for checking that no imports are missing
-
-CHECKLINK_RPATH = library
-
-checklink:: $(MODULE).so $(SUBDIRS:%=%/__checklink__)
-	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE).so && $(RM) checklink
-
 # Rules for testing
 
 check test:: $(TESTRESULTS) $(SUBDIRS:%=%/__test__)
diff --git a/programs/Makefile.in b/programs/Makefile.in
index b7c1a33b570..5c1fa8381ce 100644
--- a/programs/Makefile.in
+++ b/programs/Makefile.in
@@ -112,8 +112,6 @@ clean::
 
 # Rules for testing
 
-checklink:: $(SUBDIRS:%=%/__checklink__)
-
 check test:: $(SUBDIRS:%=%/__test__)
 
 # Rules for symlinks
diff --git a/programs/Makeprog.rules.in b/programs/Makeprog.rules.in
index ee24a49b09c..5bf2d265a15 100644
--- a/programs/Makeprog.rules.in
+++ b/programs/Makeprog.rules.in
@@ -39,13 +39,6 @@ $(BASEMODULE): $(WINEWRAPPER)
 $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
 	$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS)
 
-# Rules for checking that no imports are missing
-
-CHECKLINK_RPATH = library
-
-checklink:: $(MODULE).so $(SUBDIRS:%=%/__checklink__)
-	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE).so && $(RM) checklink
-
 # Rules for testing
 
 check test:: $(SUBDIRS:%=%/__test__)
diff --git a/programs/avitools/Makefile.in b/programs/avitools/Makefile.in
index 6a987be56d0..08d1b3360c3 100644
--- a/programs/avitools/Makefile.in
+++ b/programs/avitools/Makefile.in
@@ -76,13 +76,4 @@ uninstall:: uninstall_prog$(DLLEXT)
 clean::
 	$(RM) $(PROGRAMS:.exe=)
 
-# Rules for checking that no imports are missing
-
-CHECKLINK_RPATH = library
-
-checklink:: $(PROGRAMS:%=%.so)
-	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c aviinfo.exe.so && $(RM) checklink
-	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c aviplay.exe.so && $(RM) checklink
-	$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c icinfo.exe.so && $(RM) checklink
-
 ### Dependencies: