Skip to content

Commit

Permalink
meson: some cleanup, fixes, organizing.
Browse files Browse the repository at this point in the history
- remove makefiles, autotools stuff
- move gresource files into their own directory
- move nemo_action.in files and scripts into their own directory
- add post-install scripts for bare builds.
- tweak debian stuff
- ensure legacy location for extension install folder
  (/usr/lib/nemo/extensions-3.0) rather than /usr/lib/<arch>/nemo) -
  this keeps extensions that haven't been re-built from breaking.
- Fix gdbus-codegen for the cinnamon proxy (annotations aren't available
  in mint 18's glib) - this was being done purely for class naming
  preference.
  • Loading branch information
mtwebster committed Feb 5, 2018
1 parent 5758c0a commit b87d88d
Show file tree
Hide file tree
Showing 91 changed files with 775 additions and 3,789 deletions.
74 changes: 2 additions & 72 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -32,87 +32,17 @@ local.properties
# PDT-specific
.buildpath

*.lo
*.la
*.lai
*.so.*
*.so
*.o
*.a
*.valid
*.xml
*.pc
*.log
*.before
*.after
*.m4

missing
depcomp
gtk-doc.make
install-sh
libtool
ltmain.sh
stamp-h1
test-driver
autom4te.cache
compile

Makefile
Makefile.in

config.*
!config.h.in
configure

data/*.desktop.in
data/*.desktop
data/*.service

debian/tmp/*
debian/nemo/*
debian/nemo-dbg/*
debian/nemo-data/*
debian/libnemo-extension*/*
debian/gir1.2*/*

debian/*.log
debian/.debhelper
debian/debhelper-build-stamp
debian/files
debian/gir1.2-nemo-3.0.install
*.substvars
*.debhelper

docs/reference/libnemo-extension/*

eel/check-program

libnemo-extension/Nemo-3.0.*
libnemo-private/*.valid
libnemo-private/*.xml
libnemo-private/.libs
libnemo-private/nemo-generated.*

po/.intltool-merge-cache
po/POTFILES
po/stamp-it

src/nemo-freedesktop-generated.*
src/nemo-resources.*
src/.libs
src/Makefile
src/Makefile.in
src/nemo
src/nemo-autorun-software
src/nemo-connect-server
src/nemo-convert-metadata
src/nemo-extensions-list
src/nemo-open-with
src/nemo-desktop
src/org.nemo.root.policy

test/.libs
test/test-eel-editable-label
test/test-nemo-copy
test/test-nemo-directory-async
test/test-nemo-search-engine
build
60 changes: 0 additions & 60 deletions Makefile.am

This file was deleted.

1 change: 0 additions & 1 deletion Makefile.shared

This file was deleted.

1 change: 0 additions & 1 deletion add-include-prefix

This file was deleted.

41 changes: 0 additions & 41 deletions autogen.sh

This file was deleted.

146 changes: 0 additions & 146 deletions config.h.in

This file was deleted.

9 changes: 0 additions & 9 deletions config.h.meson.in
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,6 @@
#mesondefine LOCALEDIR
#mesondefine LOCALE_DIR




// Defined if we meet the minimum version for
// g_content_type_get_generic_icon_name
#mesondefine GENERIC_ICON_API



// Define to 1 if you have the <malloc.h> header file.
#mesondefine HAVE_MALLOC_H

Expand Down
Loading

0 comments on commit b87d88d

Please sign in to comment.