diff options
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 158 |
1 files changed, 4 insertions, 154 deletions
diff --git a/Makefile.am b/Makefile.am index d21982285f..e908ca2984 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,9 +42,9 @@ LIBUDEV_CURRENT=7 LIBUDEV_REVISION=4 LIBUDEV_AGE=6 -LIBSYSTEMD_CURRENT=9 +LIBSYSTEMD_CURRENT=10 LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=9 +LIBSYSTEMD_AGE=10 # The following four libraries only exist for compatibility reasons, # their version info should not be bumped anymore @@ -237,7 +237,6 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libsystemd/sd-hwdb \ -I $(top_srcdir)/src/libsystemd/sd-device \ -I $(top_srcdir)/src/libsystemd-network \ - -I $(top_srcdir)/src/libsystemd-terminal \ $(OUR_CPPFLAGS) AM_CFLAGS = $(OUR_CFLAGS) @@ -2427,16 +2426,6 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ if ENABLE_EFI -systemgenerator_PROGRAMS += \ - systemd-efi-boot-generator - -systemd_efi_boot_generator_SOURCES = \ - src/efi-boot-generator/efi-boot-generator.c - -systemd_efi_boot_generator_LDADD = \ - libshared.la - -# ------------------------------------------------------------------------------ if HAVE_BLKID bootctl_SOURCES = \ src/boot/bootctl.c @@ -3308,145 +3297,6 @@ manual_tests += \ test-pppoe # ------------------------------------------------------------------------------ -if ENABLE_TERMINAL -noinst_LTLIBRARIES += \ - libsystemd-terminal.la - -rootlibexec_PROGRAMS += \ - systemd-consoled - -noinst_PROGRAMS += \ - systemd-evcat \ - systemd-modeset \ - systemd-subterm - -pkgdata_DATA = \ - src/libsystemd-terminal/unifont-glyph-array.bin - -nodist_userunit_DATA += \ - units/user/systemd-consoled.service - -USER_DEFAULT_TARGET_WANTS += \ - systemd-consoled.service - -tests += \ - test-term-page \ - test-term-parser \ - test-unifont -endif - -EXTRA_DIST += \ - units/user/systemd-consoled.service.in - -libsystemd_terminal_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(TERMINAL_CFLAGS) - -libsystemd_terminal_la_SOURCES = \ - src/libsystemd-terminal/grdev.h \ - src/libsystemd-terminal/grdev-internal.h \ - src/libsystemd-terminal/grdev.c \ - src/libsystemd-terminal/grdev-drm.c \ - src/libsystemd-terminal/idev.h \ - src/libsystemd-terminal/idev-internal.h \ - src/libsystemd-terminal/idev.c \ - src/libsystemd-terminal/idev-evdev.c \ - src/libsystemd-terminal/idev-keyboard.c \ - src/libsystemd-terminal/sysview.h \ - src/libsystemd-terminal/sysview-internal.h \ - src/libsystemd-terminal/sysview.c \ - src/libsystemd-terminal/term.h \ - src/libsystemd-terminal/term-internal.h \ - src/libsystemd-terminal/term-charset.c \ - src/libsystemd-terminal/term-page.c \ - src/libsystemd-terminal/term-parser.c \ - src/libsystemd-terminal/term-screen.c \ - src/libsystemd-terminal/term-wcwidth.c \ - src/libsystemd-terminal/unifont.h \ - src/libsystemd-terminal/unifont-def.h \ - src/libsystemd-terminal/unifont.c - -libsystemd_terminal_la_LIBADD = \ - libshared.la \ - $(TERMINAL_LIBS) - -systemd_consoled_CFLAGS = \ - $(AM_CFLAGS) \ - $(TERMINAL_CFLAGS) - -systemd_consoled_SOURCES = \ - src/console/consoled.h \ - src/console/consoled.c \ - src/console/consoled-display.c \ - src/console/consoled-manager.c \ - src/console/consoled-session.c \ - src/console/consoled-terminal.c \ - src/console/consoled-workspace.c - -systemd_consoled_LDADD = \ - libsystemd-terminal.la \ - libshared.la \ - $(TERMINAL_LIBS) - -systemd_evcat_CFLAGS = \ - $(AM_CFLAGS) \ - $(TERMINAL_CFLAGS) - -systemd_evcat_SOURCES = \ - src/libsystemd-terminal/evcat.c - -systemd_evcat_LDADD = \ - libsystemd-terminal.la \ - libshared.la \ - $(TERMINAL_LIBS) - -systemd_modeset_CFLAGS = \ - $(AM_CFLAGS) \ - $(TERMINAL_CFLAGS) - -systemd_modeset_SOURCES = \ - src/libsystemd-terminal/modeset.c - -systemd_modeset_LDADD = \ - libsystemd-terminal.la \ - libshared.la \ - $(TERMINAL_LIBS) - -systemd_subterm_SOURCES = \ - src/libsystemd-terminal/subterm.c - -systemd_subterm_LDADD = \ - libsystemd-terminal.la \ - libshared.la - -test_term_page_SOURCES = \ - src/libsystemd-terminal/test-term-page.c - -test_term_page_LDADD = \ - libsystemd-terminal.la \ - libshared.la - -test_term_parser_SOURCES = \ - src/libsystemd-terminal/test-term-parser.c - -test_term_parser_LDADD = \ - libsystemd-terminal.la \ - libshared.la - -test_unifont_SOURCES = \ - src/libsystemd-terminal/test-unifont.c - -test_unifont_LDADD = \ - libsystemd-terminal.la \ - libshared.la - -src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT) - $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@ - -EXTRA_DIST += \ - tools/compile-unifont.py - -# ------------------------------------------------------------------------------ include_HEADERS += \ src/libudev/libudev.h @@ -6164,12 +6014,12 @@ git-tag: .PHONY: git-tar git-tar: - git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz + git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd .PHONY: doc-sync -doc-sync: all destdir-sphinx +doc-sync: all rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/ .PHONY: gardel |