diff options
| author | Stefano Karapetsas <[email protected]> | 2014-02-18 18:37:12 +0100 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-02-18 18:37:12 +0100 |
| commit | a976f345a73db73307b318417084e967ee75422f (patch) | |
| tree | 55e6d8f233f9c215e2fd9c7c23cb35af41e8df2b /capplets/windows/Makefile.am | |
| parent | c77d85a68bfc5c6e6e8f37d84c4f18217e81db92 (diff) | |
| parent | b0ba7d51e7da6a775d0d61d830b87700e17fd196 (diff) | |
| download | mate-control-center-a976f345a73db73307b318417084e967ee75422f.tar.bz2 mate-control-center-a976f345a73db73307b318417084e967ee75422f.tar.xz | |
Merge branch 'dev-windows-improved'
Diffstat (limited to 'capplets/windows/Makefile.am')
| -rw-r--r-- | capplets/windows/Makefile.am | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index 1327573e..6be448d3 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -3,8 +3,7 @@ cappletname = window bin_PROGRAMS = mate-window-properties -mate_window_properties_LDADD = $(MATECC_CAPPLETS_LIBS) \ - $(top_builddir)/libwindow-settings/libmate-window-settings.la +mate_window_properties_LDADD = $(MATECC_CAPPLETS_LIBS) mate_window_properties_SOURCES = \ mate-metacity-support.h \ @@ -21,8 +20,6 @@ Desktop_in_files = mate-window-properties.desktop.in desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop) AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \ - -I$(top_srcdir)/libwindow-settings \ - -DMATE_WINDOW_MANAGER_MODULE_PATH=\""$(libdir)/window-manager-settings"\" \ -DUIDIR=\""$(uidir)"\" \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DPIXMAPDIR=\""$(pixmapdir)"\" |