2001-05-08 14:10:35 +00:00
|
|
|
--- Makefile.in.orig Mon May 7 07:14:03 2001
|
|
|
|
+++ Makefile.in Mon May 7 07:14:46 2001
|
|
|
|
@@ -365,39 +365,23 @@
|
|
|
|
|
2000-01-16 19:13:32 +00:00
|
|
|
CREATE_LINKS: @WX_LIBRARY_NAME_SHARED@
|
|
|
|
@$(RM) ./lib/@WX_LIBRARY_LINK1@
|
|
|
|
- @$(RM) ./lib/@WX_LIBRARY_LINK2@
|
|
|
|
- @$(RM) ./lib/@WX_LIBRARY_LINK3@
|
2000-05-20 13:35:35 +00:00
|
|
|
cd lib \
|
|
|
|
- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@ \
|
|
|
|
- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK2@ \
|
|
|
|
- && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK3@
|
|
|
|
+ && $(LN_S) @WX_TARGET_LIBRARY@ @WX_LIBRARY_LINK1@
|
2001-05-08 14:10:35 +00:00
|
|
|
|
2000-05-20 13:35:35 +00:00
|
|
|
CREATE_LINKS_GL: @WX_LIBRARY_NAME_SHARED_GL@
|
|
|
|
@$(RM) ./lib/@WX_LIBRARY_LINK1_GL@
|
|
|
|
- @$(RM) ./lib/@WX_LIBRARY_LINK2_GL@
|
|
|
|
- @$(RM) ./lib/@WX_LIBRARY_LINK3_GL@
|
|
|
|
cd lib \
|
|
|
|
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@ \
|
|
|
|
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK2_GL@ \
|
|
|
|
- && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK3_GL@
|
|
|
|
+ && $(LN_S) @WX_TARGET_LIBRARY_GL@ @WX_LIBRARY_LINK1_GL@
|
2001-05-08 14:10:35 +00:00
|
|
|
|
2000-05-20 13:35:35 +00:00
|
|
|
CREATE_INSTALLED_LINKS: preinstall
|
2000-01-16 19:13:32 +00:00
|
|
|
$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
|
|
|
- $(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
|
|
|
- $(RM) $(libdir)/@WX_LIBRARY_LINK3@
|
2000-05-20 13:35:35 +00:00
|
|
|
cd $(libdir) \
|
|
|
|
- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@ \
|
|
|
|
- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK2@ \
|
|
|
|
- && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK3@
|
|
|
|
+ && $(LN_S) @WX_LIBRARY_NAME_SHARED@ @WX_LIBRARY_LINK1@
|
2001-05-08 14:10:35 +00:00
|
|
|
|
2000-05-20 13:35:35 +00:00
|
|
|
CREATE_INSTALLED_LINKS_GL: preinstall_gl
|
|
|
|
$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
|
|
|
- $(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
|
|
|
- $(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
|
|
|
|
cd $(libdir) \
|
|
|
|
- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@ \
|
|
|
|
- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK2_GL@ \
|
|
|
|
- && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK3_GL@
|
|
|
|
+ && $(LN_S) @WX_LIBRARY_NAME_SHARED_GL@ @WX_LIBRARY_LINK1_GL@
|
2001-05-08 14:10:35 +00:00
|
|
|
|
2000-01-16 19:13:32 +00:00
|
|
|
$(OBJECTS): $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h
|
|
|
|
|
2001-05-08 14:10:35 +00:00
|
|
|
@@ -499,13 +483,9 @@
|
2000-01-16 19:13:32 +00:00
|
|
|
@echo " Removing library..."
|
|
|
|
@$(RM) $(libdir)/@WX_TARGET_LIBRARY@
|
|
|
|
@$(RM) $(libdir)/@WX_LIBRARY_LINK1@
|
|
|
|
- @$(RM) $(libdir)/@WX_LIBRARY_LINK2@
|
|
|
|
- @$(RM) $(libdir)/@WX_LIBRARY_LINK3@
|
2000-05-20 13:35:35 +00:00
|
|
|
@echo " Removing GL library..."
|
|
|
|
@$(RM) $(libdir)/@WX_TARGET_LIBRARY_GL@
|
|
|
|
@$(RM) $(libdir)/@WX_LIBRARY_LINK1_GL@
|
|
|
|
- @$(RM) $(libdir)/@WX_LIBRARY_LINK2_GL@
|
|
|
|
- @$(RM) $(libdir)/@WX_LIBRARY_LINK3_GL@
|
2000-01-16 19:13:32 +00:00
|
|
|
@echo " Removing helper files..."
|
2001-05-08 14:10:35 +00:00
|
|
|
@$(RM) $(libdir)/wx/include/wx/@TOOLKIT_NAME@/setup.h
|
2000-01-16 19:13:32 +00:00
|
|
|
@$(RM) $(bindir)/wx-config
|