Commit e0c6370c authored by Alexandre Julliard's avatar Alexandre Julliard

Removed some checklink rules made unnecessary by the -z defs linker

flag.
parent a6e50802
...@@ -57,8 +57,7 @@ $(WIN16_FILES:%=__checklink16__%): checklink16 ...@@ -57,8 +57,7 @@ $(WIN16_FILES:%=__checklink16__%): checklink16
checklink16:: $(MAINSPEC).o $(OBJS) $(MODULE).dbg.o dummy 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 $(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__%) checklink:: $(WIN16_FILES:%=__checklink16__%)
$(CC) -o checklink $(CHECKLINK_RPATH:%=-Wl,-rpath,$(TOPOBJDIR)/%) $(TOPSRCDIR)/library/checklink.c $(MODULE)$(DLLEXT) && $(RM) checklink
# Rules for testing # Rules for testing
......
...@@ -47,13 +47,6 @@ $(MODULE): $(OBJS) $(RCOBJS) Makefile.in ...@@ -47,13 +47,6 @@ $(MODULE): $(OBJS) $(RCOBJS) Makefile.in
$(TESTLIST): Makefile.in $(TESTLIST): Makefile.in
$(TOPSRCDIR)/tools/make_ctests $(CTESTS) >$(TESTLIST) || $(RM) $(TESTLIST) $(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 # Rules for testing
check test:: $(TESTRESULTS) $(SUBDIRS:%=%/__test__) check test:: $(TESTRESULTS) $(SUBDIRS:%=%/__test__)
......
...@@ -112,8 +112,6 @@ clean:: ...@@ -112,8 +112,6 @@ clean::
# Rules for testing # Rules for testing
checklink:: $(SUBDIRS:%=%/__checklink__)
check test:: $(SUBDIRS:%=%/__test__) check test:: $(SUBDIRS:%=%/__test__)
# Rules for symlinks # Rules for symlinks
......
...@@ -39,13 +39,6 @@ $(BASEMODULE): $(WINEWRAPPER) ...@@ -39,13 +39,6 @@ $(BASEMODULE): $(WINEWRAPPER)
$(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in $(MODULE): $(ALL_OBJS) $(RCOBJS) Makefile.in
$(CC) $(ALL_OBJS) $(RCOBJS) -o $@ $(DELAYIMPORTS:%=-l%) $(IMPORTS:%=-l%) $(ALL_LIBS) $(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 # Rules for testing
check test:: $(SUBDIRS:%=%/__test__) check test:: $(SUBDIRS:%=%/__test__)
......
...@@ -76,13 +76,4 @@ uninstall:: uninstall_prog$(DLLEXT) ...@@ -76,13 +76,4 @@ uninstall:: uninstall_prog$(DLLEXT)
clean:: clean::
$(RM) $(PROGRAMS:.exe=) $(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: ### Dependencies:
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment