diff options
| author | Philip Withnall <pwithnall@gnome.org> | 2023-12-04 14:10:34 +0000 |
|---|---|---|
| committer | Philip Withnall <pwithnall@gnome.org> | 2023-12-04 17:41:52 +0000 |
| commit | 3a0ba5cc121a80c066f67f684da2ba43a0871176 (patch) | |
| tree | f308d83182b9c85684bdcd8c9b963fdc1bb935fe | |
| parent | 0b305dc9286c77229d697181a646dc432c4aea68 (diff) | |
build: Drop make support
Now that other projects (such as shared-mime-info) can use xdgmime as a
meson subproject, they don’t need to embed it using `make`.
Maintaining one build system is hard enough in any project, so let’s
drop the old one.
Signed-off-by: Philip Withnall <pwithnall@gnome.org>
Fixes: #36
| -rw-r--r-- | .gitlab-ci.yml | 15 | ||||
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | src/Makefile | 22 |
3 files changed, 0 insertions, 49 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a8c45b9..400f162 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,7 +4,6 @@ variables: DEPENDENCIES: gcc gcc-c++ glibc-devel - make libxml2-devel glib2-devel gettext @@ -15,20 +14,6 @@ variables: gettext-devel meson -build:autotools: - before_script: - - dnf update -y --nogpgcheck - - dnf install -y --nogpgcheck $DEPENDENCIES - script: - - make - - # Compile shared-mime-info - - git clone https://gitlab.freedesktop.org/xdg/shared-mime-info.git - - cd shared-mime-info - - meson setup _build -Dxdgmime-path=$PWD/../ - - meson compile -C _build - - meson test -C _build - build:meson: before_script: - dnf update -y --nogpgcheck diff --git a/Makefile b/Makefile deleted file mode 100644 index 28cfaef..0000000 --- a/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -SUBDIRS=src - -all-recursive clean-recursive: - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $(SUBDIRS); do \ - (cd $$subdir && make "$$target") \ - done; - -all: all-recursive - -clean: clean-recursive - rm -f *~ diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index c2a9a76..0000000 --- a/src/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -.POSIX: -.PHONY: all clean - -C_STD = -std=c99 -D_POSIX_C_SOURCE=200809L -ALL_CFLAGS = $(C_STD) -c -g -DXDG_PREFIX=xdg_test -DHAVE_MMAP -Wall -Wmissing-prototypes -Werror=sign-compare $(CFLAGS) - -.c.o: - $(CC) $(ALL_CFLAGS) -o $@ $< - -all: test-mime test-mime-data print-mime-data - -test-mime: test-mime.o xdgmime.o xdgmimeglob.o xdgmimeint.o xdgmimemagic.o xdgmimealias.o xdgmimeparent.o xdgmimecache.o xdgmimeicon.o - $(CC) $(LDFLAGS) -o $@ $? - -test-mime-data: test-mime-data.o xdgmime.o xdgmimeglob.o xdgmimeint.o xdgmimemagic.o xdgmimealias.o xdgmimeparent.o xdgmimecache.o xdgmimeicon.o - $(CC) $(LDFLAGS) -o $@ $? - -print-mime-data: print-mime-data.o xdgmime.o xdgmimeglob.o xdgmimeint.o xdgmimemagic.o xdgmimealias.o xdgmimeparent.o xdgmimecache.o xdgmimeicon.o - $(CC) $(LDFLAGS) -o $@ $? - -clean: - rm -f *~ *.o test-mime test-mime-data print-mime-data |