diff options
| author | Victor Kareh <[email protected]> | 2019-05-21 14:44:09 -0400 |
|---|---|---|
| committer | Victor Kareh <[email protected]> | 2019-06-05 10:49:37 -0400 |
| commit | 08cfade26efdb43e753166262f41e53cd0976509 (patch) | |
| tree | 4de71dfed13b1be7c84c35c5bef7a446c2a644f3 /src | |
| parent | 17213f256a0c63c7f100e9b09fadbda4ee46a3ec (diff) | |
| download | marco-08cfade26efdb43e753166262f41e53cd0976509.tar.bz2 marco-08cfade26efdb43e753166262f41e53cd0976509.tar.xz | |
build everything as library
upstream commit:
https://gitlab.gnome.org/GNOME/metacity/commit/d982d0a5
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 34 |
1 files changed, 11 insertions, 23 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0b66147b..455e846a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -13,7 +13,14 @@ AM_CPPFLAGS = \ -DSN_API_NOT_YET_FROZEN=1 \ @MARCO_CFLAGS@ -marco_SOURCES = \ +marco_SOURCES= \ + core/main.c \ + include/main.h + +# by setting libmarco_private_la_CFLAGS, the files shared with +# marco proper will be compiled with different names. +libmarco_private_la_CFLAGS = +libmarco_private_la_SOURCES= \ core/async-getprop.c \ core/async-getprop.h \ core/atomnames.h \ @@ -95,6 +102,8 @@ marco_SOURCES = \ ui/menu.h \ ui/metaaccellabel.c \ ui/metaaccellabel.h \ + ui/preview-widget.c \ + ui/preview-widget.h \ ui/resizepopup.c \ include/resizepopup.h \ ui/tabpopup.c \ @@ -108,25 +117,6 @@ marco_SOURCES = \ ui/ui.c \ include/all-keybindings.h -# by setting libmarco_private_la_CFLAGS, the files shared with -# marco proper will be compiled with different names. -libmarco_private_la_CFLAGS = -libmarco_private_la_SOURCES = \ - core/boxes.c \ - include/boxes.h \ - ui/gradient.c \ - ui/gradient.h \ - core/util.c \ - include/util.h \ - core/common.c \ - include/common.h \ - ui/preview-widget.c \ - ui/preview-widget.h \ - ui/theme-parser.c \ - ui/theme-parser.h \ - ui/theme.c \ - ui/theme.h - libmarco_private_la_LDFLAGS = -no-undefined -version-info 1:0:0 libmarco_private_la_LIBADD = @MARCO_LIBS@ @@ -146,9 +136,7 @@ marco_theme_viewer_SOURCES= \ bin_PROGRAMS=marco marco-theme-viewer -EFENCE= -marco_LDADD=@MARCO_LIBS@ $(EFENCE) - +marco_LDADD=@MARCO_LIBS@ libmarco-private.la marco_theme_viewer_LDADD= @MARCO_LIBS@ libmarco-private.la testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c |