From: Robert Roebling <robert@roebling.de>
Date: Tue, 4 Jan 2000 20:14:54 +0000 (+0000)
Subject:   EXTRA_LIBS vs. EXTRALIBS change.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/64d78265d0256eb00ae59b717aa97e4c5786e003

  EXTRA_LIBS vs. EXTRALIBS change.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5244 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/make.env.in b/src/make.env.in
index d5ee1c213e..e21dc7fef2 100644
--- a/src/make.env.in
+++ b/src/make.env.in
@@ -11,8 +11,8 @@
 ####################### GENERAL SETTINGS ############################
 
 
-EXTRA_LIBS = @EXTRA_LIBS@
-LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRA_LIBS)
+EXTRALIBS = @EXTRA_LIBS@
+LDLIBS = ${top_builddir}/lib/@WX_TARGET_LIBRARY@  $(EXTRALIBS)
 
 TOOLKIT = @TOOLKIT@
 TOOLKITDIR = @TOOLKIT_DIR@
diff --git a/src/makeprog.env.in b/src/makeprog.env.in
index 91cb25337d..e529f590f1 100644
--- a/src/makeprog.env.in
+++ b/src/makeprog.env.in
@@ -24,7 +24,7 @@ include $(top_builddir)/src/make.env
 all:    $(BIN_PROGRAM) install_dirs install_data
 
 $(BIN_PROGRAM):	$(OBJECTS) $(top_builddir)/lib/@WX_TARGET_LIBRARY@
-	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(EXTRALIBS) $(LDLIBS)
+	$(CC) $(LDFLAGS) -o $(BIN_PROGRAM) $(OBJECTS) $(LDLIBS)
 
 install_dirs:
 	@list='$(DATADIRS)'; for p in $$list; do \