Patch #1395 2006-08-24 19:45

afb

Add "indirect" libraries to plugins compilation
Download
1395-Add_indirect_l.patch (13.4 KB)
Category
Platform-Specific
Status
Accepted
Close date
2007-03-25 21:41
Assigned to
afb
--- src/plugins/astyle/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/astyle/Makefile.am    2007-03-02 09:46:22.000000000 +0100
@@ -11,7 +11,7 @@
 
 libastyle_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libastyle_la_LIBADD = ../../sdk/libcodeblocks.la
+libastyle_la_LIBADD = $(WX_LIBS) ../../sdk/libcodeblocks.la
 
 libastyle_la_SOURCES = asstreamiterator.cpp \
       astyleconfigdlg.cpp \
--- src/plugins/autosave/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/autosave/Makefile.am    2007-03-02 09:46:22.000000000 +0100
@@ -8,7 +8,7 @@
 
 libautosave_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libautosave_la_LIBADD = ../../sdk/libcodeblocks.la
+libautosave_la_LIBADD = $(WX_LIBS) ../../sdk/libcodeblocks.la
 
 libautosave_la_SOURCES = autosave.cpp
 noinst_HEADERS = autosave.h
--- src/plugins/classwizard/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/classwizard/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -10,7 +10,7 @@
 
 libclasswizard_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libclasswizard_la_LIBADD = ../../sdk/libcodeblocks.la
+libclasswizard_la_LIBADD = $(WX_LIBS) ../../sdk/libcodeblocks.la
 
 libclasswizard_la_SOURCES = classwizard.cpp classwizarddlg.cpp
 noinst_HEADERS = classwizard.h classwizarddlg.h
--- src/plugins/codecompletion/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/codecompletion/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -11,7 +11,7 @@
 
 libcodecompletion_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libcodecompletion_la_LIBADD = ../../sdk/libcodeblocks.la
+libcodecompletion_la_LIBADD = $(WX_LIBS) ../../sdk/libcodeblocks.la
 
 libcodecompletion_la_SOURCES = ccdebuginfo.cpp \
             ccoptionsdlg.cpp \
--- src/plugins/compilergcc/Makefile.am.orig    2007-03-02 09:35:13.000000000 +0100
+++ src/plugins/compilergcc/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -15,7 +15,7 @@
 
 libcompiler_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libcompiler_la_LIBADD = ../../sdk/libcodeblocks.la \
+libcompiler_la_LIBADD = $(WX_LIBS) ../../sdk/libcodeblocks.la \
                 depslib/src/libdepslib.la
 
 libcompiler_la_SOURCES = advancedcompileroptionsdlg.cpp \
--- src/plugins/contrib/byogames/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/contrib/byogames/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -8,7 +8,7 @@
 
 libbyogames_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libbyogames_la_LIBADD = ../../../sdk/libcodeblocks.la
+libbyogames_la_LIBADD = $(WX_LIBS) ../../../sdk/libcodeblocks.la
 
 libbyogames_la_SOURCES = byocbtris.cpp \
             byogame.cpp \
--- src/plugins/contrib/cb_koders/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/contrib/cb_koders/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -8,7 +8,7 @@
 
 libcb_koders_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libcb_koders_la_LIBADD = ../../../sdk/libcodeblocks.la
+libcb_koders_la_LIBADD = $(WX_LIBS) ../../../sdk/libcodeblocks.la
 
 libcb_koders_la_SOURCES = kodersdialog.cpp \
             cb_koders.cpp
--- src/plugins/contrib/codesnippets/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/contrib/codesnippets/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -10,7 +10,7 @@
 
 libcodesnippets_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libcodesnippets_la_LIBADD = ../../../sdk/libcodeblocks.la
+libcodesnippets_la_LIBADD = $(WX_LIBS) ../../../sdk/libcodeblocks.la
 
 libcodesnippets_la_SOURCES =     codesnippets.cpp \
                 codesnippetstreectrl.cpp \
--- src/plugins/contrib/codestat/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/contrib/codestat/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -10,7 +10,7 @@
 
 libcodestat_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libcodestat_la_LIBADD = ../../../sdk/libcodeblocks.la
+libcodestat_la_LIBADD = $(WX_LIBS) ../../../sdk/libcodeblocks.la
 
 libcodestat_la_SOURCES = codestatconfig.cpp \
             codestat.cpp \
--- src/plugins/contrib/dragscroll/Makefile.am.orig    2007-03-02 09:35:12.000000000 +0100
+++ src/plugins/contrib/dragscroll/Makefile.am    2007-03-02 09:46:23.000000000 +0100
@@ -8,7 +8,7 @@
 
 libdragscroll_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
 
-libdragscroll_la_LIBADD = ../../../sdk/libcodeblocks.la
+libdragscroll_la_LIBADD = $(WX_LIBS) ../../../sdk/libcodeblocks.la
 
 libdragscroll_la_SOURCES = dragscroll.cpp \
             dragscrollcfg.cpp
--- src/plugins/contrib/envvars/Makefile.am.orig    2007-03-02 09:35:11.000000000 +0100
+++ src/plugins/contrib/envva
download for full patch...
afb 2006-08-24 19:46

Otherwise you get linker errors like this:

ld: object_file illegal reference to symbol: ***

defined in indirectly referenced dynamic library: ***

afb 2006-08-28 12:11

It would be nice if this could be applied to Subversion, since

"patch" doesn't like the DOS (CRLF) linefeeds on some of the

current Makefile.am files (btw: what are those doing there ?)

afb 2006-09-17 06:57
afb 2006-09-24 18:47

Old version had gotten outdated, here is a new one... (rev 2994)

afb 2006-10-25 19:37

New "symtab" plugin is missing from the previous patch,

but it needs the same kind of workaround as the rest...

libSymTab_la_LIBADD = $(WX_LIBS) ../../../sdk/libcodeblocks.la

Will post an updated version of the patch, next time that

I have a wxMac build that actually works somewhat to use...

afb 2006-10-26 08:09

Fix for "Profiler" and "symtab" errors.

codeblocks-rev3146_pluginslib.patch

afb 2006-11-30 10:13

Old version had gotten outdated, here is a new one... (rev 3312)

codeblocks-rev3312_pluginslib.patch

afb 2007-03-02 09:17

Patch updated for rev 3656

afb 2007-03-02 09:17

Patch updated for rev 3656

afb 2007-03-25 21:41

applied (with changes) in revision 3760