diff options
| author | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-12-04 21:21:37 +0100 |
|---|---|---|
| committer | Robin Haberkorn <robin.haberkorn@googlemail.com> | 2012-12-04 22:07:17 +0100 |
| commit | 1826d4de5903f496bd424d3f93a7c8f307ce6759 (patch) | |
| tree | bea921b72f79a1b5de168e56254252668358cc08 | |
| parent | 655b527827fc2b64b374a1d29e884e92269e9cae (diff) | |
| download | sciteco-1826d4de5903f496bd424d3f93a7c8f307ce6759.tar.gz | |
additional minor changes: distribution building now possible
| -rw-r--r-- | Makefile.am | 6 | ||||
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/ring.cpp | 2 |
4 files changed, 17 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index b59eaa9..d8a55af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,6 +3,6 @@ SUBDIRS = src dist_sciteco_data_DATA = teco.ini -EXTRA_DIST = compat/bsd/sys/cdefs.h \ - compat/bsd/sys/queue.h \ - compat/bsd/sys/tree.h +noinst_HEADERS = compat/bsd/sys/cdefs.h \ + compat/bsd/sys/queue.h \ + compat/bsd/sys/tree.h diff --git a/configure.ac b/configure.ac index 416b934..c4529cd 100644 --- a/configure.ac +++ b/configure.ac @@ -34,6 +34,7 @@ fi # Checks for libraries. PKG_CHECK_MODULES(LIBGLIB, [glib-2.0], [ CFLAGS="$CFLAGS $LIBGLIB_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBGLIB_CFLAGS" LDFLAGS="$LDFLAGS $LIBGLIB_LIBS" ]) @@ -75,7 +76,7 @@ AC_ARG_WITH(scintilla, SCINTILLA_PATH=`$READLINK -e $SCINTILLA_PATH` AC_SUBST(SCINTILLA_PATH) -CFLAGS="$CFLAGS -I$SCINTILLA_PATH/include -DSCI_LEXER" +CPPFLAGS="$CPPFLAGS -I$SCINTILLA_PATH/include -DSCI_LEXER" LDFLAGS="$LDFLAGS $SCINTILLA_PATH/bin/scintilla.a" AC_ARG_WITH(interface, @@ -94,7 +95,7 @@ ncurses) AC_DEFINE(INTERFACE_NCURSES, , [Build with curses support]) # For Scintilla: - CFLAGS="$CFLAGS -DNCURSES -I$SCINTILLA_PATH/scinterm" + CPPFLAGS="$CPPFLAGS -DNCURSES -I$SCINTILLA_PATH/scinterm" ;; pdcurses) @@ -111,12 +112,13 @@ pdcurses) ]) # For Scintilla: - CFLAGS="$CFLAGS -DNCURSES -I$SCINTILLA_PATH/scinterm" + CPPFLAGS="$CPPFLAGS -DNCURSES -I$SCINTILLA_PATH/scinterm" ;; gtk) PKG_CHECK_MODULES(LIBGTK, [gtk+-2.0], [ CFLAGS="$CFLAGS $LIBGTK_CFLAGS" + CXXFLAGS="$CXXFLAGS $LIBGTK_CFLAGS" LDFLAGS="$LDFLAGS $LIBGTK_LIBS" ]) AC_CHECK_PROG(GOB2, gob2, gob2) @@ -126,7 +128,7 @@ gtk) AC_DEFINE(INTERFACE_GTK, , [Build with GTK+ 2.0 support]) # For Scintilla: - CFLAGS="$CFLAGS -DGTK" + CPPFLAGS="$CPPFLAGS -DGTK" ;; *) @@ -136,7 +138,7 @@ esac AM_CONDITIONAL(INTERFACE_GTK, [test x$INTERFACE = xgtk]) -CXXFLAGS="$CXXFLAGS $CFLAGS" +#CXXFLAGS="$CXXFLAGS $CFLAGS" AC_CONFIG_FILES([Makefile src/Makefile]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 9836c9a..11d2830 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -23,14 +23,15 @@ sciteco_minimal_SOURCES = main.cpp sciteco.h \ rbtree.cpp rbtree.h \ symbols.cpp symbols.h \ interface.h +nodist_sciteco_minimal_SOURCES = if INTERFACE_GTK BUILT_SOURCES += gtk-info-popup.c \ gtk-info-popup.h gtk-info-popup-private.h -sciteco_minimal_SOURCES += interface-gtk.cpp interface-gtk.h \ - gtk-info-popup.c +sciteco_minimal_SOURCES += interface-gtk.cpp interface-gtk.h +nodist_sciteco_minimal_SOURCES += gtk-info-popup.c else @@ -39,8 +40,9 @@ sciteco_minimal_SOURCES += interface-ncurses.cpp interface-ncurses.h endif bin_PROGRAMS = sciteco -sciteco_SOURCES = $(sciteco_minimal_SOURCES) \ - symbols-scintilla.cpp symbols-scilexer.cpp +sciteco_SOURCES = $(sciteco_minimal_SOURCES) +nodist_sciteco_SOURCES = $(nodist_sciteco_minimal_SOURCES) \ + symbols-scintilla.cpp symbols-scilexer.cpp %.c %.h %-private.h : %.gob @GOB2@ $< diff --git a/src/ring.cpp b/src/ring.cpp index 292f86c..1b0dbc4 100644 --- a/src/ring.cpp +++ b/src/ring.cpp @@ -20,7 +20,7 @@ #include "expressions.h" #include "ring.h" -#ifdef G_OS_WIN32 +#ifdef HAVE_WINDOWS_H /* here it shouldn't cause conflicts with other headers */ #include <windows.h> |