* refactoring: split src/ into mu/ and lib/

This commit is contained in:
djcb
2012-05-20 17:41:18 +03:00
parent 605657d4de
commit 46f10cfde9
143 changed files with 160 additions and 279 deletions

View File

@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
SUBDIRS= .
INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"'
INCLUDES=-I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"'
# don't use -Werror, as it might break on other compilers
# use -Wno-unused-parameters, because some callbacks may not
@ -28,8 +28,7 @@ INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondi
AM_CFLAGS=-Wall -Wextra -Wno-unused-parameter -Wdeclaration-after-statement
AM_CXXFLAGS=-Wall -Wextra -Wno-unused-parameter
noinst_PROGRAMS= \
noinst_PROGRAMS= \
msg2pdf
# note, mug.cc is '.cc' only because libmu must explicitly
@ -49,7 +48,7 @@ DISTCLEANFILES= \
$(BUILT_SOURCES)
msg2pdf_LDADD= \
${top_builddir}/src/libmu.la \
$(GTK_LIBS) \
msg2pdf_LDADD= \
${top_builddir}/lib/libmu.la \
$(GTK_LIBS) \
${WEBKIT_LIBS}

View File

@ -20,7 +20,7 @@ include $(top_srcdir)/gtest.mk
SUBDIRS= .
INCLUDES=-I${top_srcdir}/src $(GTK_CFLAGS) -DICONDIR='"$(icondir)"'
INCLUDES=-I${top_srcdir}/lib $(GTK_CFLAGS) -DICONDIR='"$(icondir)"'
# don't use -Werror, as it might break on other compilers
# use -Wno-unused-parameters, because some callbacks may not
@ -58,8 +58,5 @@ DISTCLEANFILES= \
mug_LDADD= \
${top_builddir}/src/libmu.la \
${top_builddir}/lib/libmu.la \
${GTK_LIBS}

View File

@ -1,6 +1,6 @@
/* -*-mode: c; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-*/
/*
** Copyright (C) 2008-2011 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** Copyright (C) 2008-2012 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
**
** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the

View File

@ -19,7 +19,7 @@ include $(top_srcdir)/gtest.mk
# enforce compiling this dir first before decending into tests/
SUBDIRS= .
INCLUDES=-I${top_srcdir} -I${top_srcdir}/src $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"' \
INCLUDES=-I${top_srcdir} -I${top_srcdir}/lib $(GTK_CFLAGS) $(WEBKIT_CFLAGS) -DICONDIR='"$(icondir)"' \
-DMUG2DIR='"$(abs_srcdir)"' -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE
# don't use -Werror, as it might break on other compilers
@ -57,10 +57,9 @@ DISTCLEANFILES= \
mug2_LDADD= \
${top_builddir}/src/libmu.la \
${top_builddir}/lib/libmu.la \
${top_builddir}/widgets/libmuwidgets.la \
${GTK_LIBS}
EXTRA_DIST= \
mug.svg