Patch #1132 2006-06-15 00:17
daniel2000
Added autotools option to install sdk headers- Download
- 1132-Added_autotool.patch (9.6 KB)
Index: src/sdk/wxFlatNotebook/Makefile.am
===================================================================
--- src/sdk/wxFlatNotebook/Makefile.am (Revision 2541)
+++ src/sdk/wxFlatNotebook/Makefile.am (Arbeitskopie)
@@ -1,8 +1,14 @@
INCLUDES = $(WX_CXXFLAGS)
+sdkdir=$(includedir)/codeblocks/wxFlatNotebook
+
noinst_LTLIBRARIES = libwxflatnotebook.la
libwxflatnotebook_la_SOURCES = wxFlatNotebook.cpp
+if INSTALL_SDK
+sdk_HEADERS = wxFNBDropTarget.h wxFlatNotebook.h
+else
noinst_HEADERS = wxFNBDropTarget.h wxFlatNotebook.h
+endif
noinst_DATA = AUTHORS README README.patch cb_wxfn.patch
EXTRADIST = AUTHORS README README.patch cb_wxfn.patch
Index: src/sdk/wxscintilla/Makefile.am
===================================================================
--- src/sdk/wxscintilla/Makefile.am (Revision 2541)
+++ src/sdk/wxscintilla/Makefile.am (Arbeitskopie)
@@ -3,6 +3,8 @@
-I$(srcdir)/src/scintilla/include \
-I$(srcdir)/src/scintilla/src
+sdkdir=$(includedir)/codeblocks/wxscintilla/include/wx
+
AM_CPPFLAGS = -DSCI_LEXER -DLINK_LEXERS -DGTK
lib_LTLIBRARIES = libwxscintilla.la
@@ -89,8 +91,7 @@
src/scintilla/src/WindowAccessor.cxx \
src/scintilla/src/XPM.cxx
-noinst_HEADERS = include/wx/wxscintilla.h \
-src/scintilla/include/Accessor.h \
+noinst_HEADERS = src/scintilla/include/Accessor.h \
src/scintilla/include/KeyWords.h \
src/scintilla/include/Platform.h \
src/scintilla/include/PropSet.h \
@@ -120,6 +121,11 @@
src/scintilla/src/XPM.h \
src/PlatWX.h \
src/ScintillaWX.h
+if INSTALL_SDK
+sdk_HEADERS = include/wx/wxscintilla.h
+else
+noinst_HEADERS += include/wx/wxscintilla.h
+endif
EXTRA_DIST = $(srcdir)/Readme \
$(srcdir)/build/BuildInfo.txt \
Index: src/sdk/Makefile.am
===================================================================
--- src/sdk/Makefile.am (Revision 2541)
+++ src/sdk/Makefile.am (Arbeitskopie)
@@ -6,6 +6,8 @@
BUILT_SOURCES =
endif
+sdkdir=$(includedir)/codeblocks
+
INCLUDES = $(WX_CXXFLAGS) \
-I$(top_srcdir)/src/sdk/wxscintilla/include \
-I$(top_srcdir)/src/sdk/tinyxml \
@@ -112,6 +114,106 @@
xtra_classes.cpp \
xtra_res.cpp
+if INSTALL_SDK
+sdk_HEADERS = annoyingdialog.h \
+ autodetectcompilers.h \
+ base64.h \
+ blockallocated.h \
+ cbeditor.h \
+ cbeditorprintout.h \
+ cbexception.h \
+ cbplugin.h \
+ cbproject.h \
+ cbthreadedtask.h \
+ cbthreadpool.h \
+ cbworkspace.h \
+ compileoptionsbase.h \
+ compiler.h \
+ compilercommandgenerator.h \
+ compilerfactory.h \
+ compileroptions.h \
+ compiletargetbase.h \
+ configmanager.h \
+ configurationpanel.h \
+ configuretoolsdlg.h \
+ confirmreplacedlg.h \
+ crc32.h \
+ devcpploader.h \
+ editarrayfiledlg.h \
+ editarrayorderdlg.h \
+ editarraystringdlg.h \
+ editkeywordsdlg.h \
+ editorbase.h \
+ editorcolourset.h \
+ editorconfigurationdlg.h \
+ editorlexerloader.h \
+ editormanager.h \
+ editor_hooks.h \
+ editpairdlg.h \
+ editpathdlg.h \
+ edittooldlg.h \
+ encodingdetector.h \
+ externaldepsdlg.h \
+ filefilters.h \
+ filegroupsandmasks.h \
+ finddlg.h \
+ findreplacebase.h \
+ globals.h \
+ ibaseloader.h \
+ ibaseworkspaceloader.h \
+ importers_globals.h \
+ incrementalselectlistdlg.h \
+ licenses.h \
+ macrosmanager.h \
+ managedthread.h \
+ manager.h \
+ managerproxy.h \
+ menuitemsmanager.h \
+ messagelog.h \
+ messagemanager.h \
+ msvc7loader.h \
+ msvc7workspaceloader.h \
+ msvcloader.h \
+ msvcworkspacebase.h \
+ msvcworkspaceloader.h \
+ multiselectdlg.h \
+ newfromtemplatedlg.h \
+ openfilestree.h \
+ personalitymanager.h \
+ pipedprocess.h \
+ pluginmanager.h \
+ pluginsconfigurationdlg.h \
+ printing_types.h \
+ projectbuildtarget.h \
+ projectdepsdlg.h \
+ projectfile.h \
+ projectfileoptionsdlg.h \
+ projectlayoutloader.h \
+ projectloader.h \
+ projectloader_hooks.h \
+
download for full patch...
History
daniel2000 2006-06-15 00:47
fixed double mention of one header file in one noinst_HEADERS variable
daniel2000 2006-06-15 09:04
forgot to remove the -Wall in bootstrap.
killerbot 2006-07-17 18:04
has been used as a template for the adjustments, no longer applies now.