Tweak some Makefiles.

Drop all old GNOME menu stuff and drop all uninstall related targets.
bareos · May 5, 2013 · eac87ee · eac87ee
1 parent 82bd9b0
commit eac87ee
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 83 deletions.
diff --git a/Makefile.in b/Makefile.in
@@ -114,38 +114,10 @@ installdirs:
 	   chgrp $(dir_group) $(DESTDIR)$(working_dir); \
 	fi
 
-gnomedirs:
-	$(MKDIR) $(DESTDIR)/usr/share/pixmaps
-	$(MKDIR) $(DESTDIR)/usr/share/gnome/apps/System
-	$(MKDIR) $(DESTDIR)/usr/share/applications
-	$(MKDIR) $(DESTDIR)/etc/security/console.apps
-	$(MKDIR) $(DESTDIR)/etc/pam.d
-
-install-menu: gnomedirs
-	${INSTALL_DATA} scripts/bareos.png $(DESTDIR)/usr/share/pixmaps/bareos.png
-	${INSTALL_DATA} scripts/bareos.desktop.gnome1 $(DESTDIR)/usr/share/gnome/apps/System/bareos.desktop
-	${INSTALL_DATA} scripts/bareos.desktop.gnome2 $(DESTDIR)/usr/share/applications/bareos.desktop
-
-install-menu-xsu: gnomedirs
-	${INSTALL_DATA} scripts/bareos.png $(DESTDIR)/usr/share/pixmaps/bareos.png
-	${INSTALL_DATA} scripts/bareos.desktop.gnome1.xsu $(DESTDIR)/usr/share/gnome/apps/System/bareos.desktop
-	${INSTALL_DATA} scripts/bareos.desktop.gnome2.xsu $(DESTDIR)/usr/share/applications/bareos.desktop
-
-install-menu-consolehelper: gnomedirs
-	${INSTALL_DATA} scripts/bareos.png $(DESTDIR)/usr/share/pixmaps/bareos.png
-	${INSTALL_DATA} scripts/bareos.desktop.gnome1.consolehelper $(DESTDIR)/usr/share/gnome/apps/System/bareos.desktop
-	${INSTALL_DATA} scripts/bareos.desktop.gnome2.consolehelper $(DESTDIR)/usr/share/applications/bareos.desktop
-	${INSTALL_DATA} scripts/gnome-console.console_apps $(DESTDIR)/etc/security/console.apps/gnome-console
-	${INSTALL_DATA} scripts/gnome-console.pamd $(DESTDIR)/etc/pam.d/gnome-console
-	ln -s $(DESTDIR)/usr/bin/consolehelper $(DESTDIR)/usr/bin/gnome-console
-
 install: installdirs
 	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
 	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
-uninstall:
-	@for I in $(all_subdirs); do (cd $$I && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1); done
-
 install-autostart:
 	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
@@ -158,31 +130,6 @@ install-autostart-fd:
 install-autostart-sd:
 	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
 
-uninstall-autostart:
-	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
-
-uninstall-autostart-dir:
-	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
-
-uninstall-autostart-fd:
-	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
-
-uninstall-autostart-sd:
-	(cd platforms && $(MAKE) DESTDIR=$(DESTDIR) $@ || exit 1)
-
-uninstall-menu:
-	$(RMF) $(DESTDIR)/usr/share/pixmaps/bareos.png
-	$(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bareos.desktop
-	$(RMF) $(DESTDIR)/usr/share/applications/bareos.desktop
-
-uninstall-menu-consolehelper:
-	$(RMF) $(DESTDIR)/usr/share/pixmaps/bareos.png
-	$(RMF) $(DESTDIR)/usr/share/gnome/apps/System/bareos.desktop
-	$(RMF) $(DESTDIR)/usr/share/applications/bareos.desktop
-	$(RMF) $(DESTDIR)/etc/security/console.apps/gnome-console
-	$(RMF) $(DESTDIR)/etc/pam.d/gnome-console
-	$(RMF) $(DESTDIR)/usr/bin/gnome-console
-
 Makefile: Makefile.in
 	cd $(topdir) \
 	    && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/manpages/Makefile.in b/manpages/Makefile.in
@@ -31,14 +31,6 @@ install:
 	     rm -f $$I.gz); \
 	done
 
-uninstall:
-	for I in ${MAN8}; \
-	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
-	done
-	for I in ${MAN1}; \
-	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
-	done
-
 clean:
 	@$(RMF) *~ 1 2 3 *.bak
 	@find . -name .#* -exec $(RMF) {} \;

diff --git a/scripts/Makefile.in b/scripts/Makefile.in
@@ -64,22 +64,6 @@ install: installdirs
 	$(INSTALL_SCRIPT) btraceback $(DESTDIR)$(sbindir)/btraceback
 	#$(INSTALL_SCRIPT) logrotate $(DESTDIR)/etc/logrotate.d/bareos-dir
 
-uninstall:
-	(cd $(DESTDIR)$(scriptdir); $(RMF) bconsole)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) bareos)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) bareos_config)
-	(cd $(DESTDIR)$(sbindir);   $(RMF) bareos)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) bareos-ctl-dir)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) bareos-ctl-fd)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) bareos-ctl-sd)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) fd)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) mtx-changer)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) disk-changer)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) btraceback.gdb)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) btraceback.dbx)
-	(cd $(DESTDIR)$(scriptdir); $(RMF) btraceback.mdb)
-	(cd $(DESTDIR)$(sbindir);   $(RMF) btraceback)
-
 Makefile: Makefile.in
 	cd $(topdir) \
 	    && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status

diff --git a/scripts/logwatch/Makefile.in b/scripts/logwatch/Makefile.in
@@ -12,9 +12,3 @@ install:
 	$(INSTALL) -m 755 applybareosdate $(DESTDIR)$(SYSCONFDIR)/scripts/shared/applybareosdate
 	$(INSTALL) -m 644 logfile.bareos.conf $(DESTDIR)$(SYSCONFDIR)/conf/logfiles/bareos.conf
 	$(INSTALL) -m 644 services.bareos.conf $(DESTDIR)$(SYSCONFDIR)/conf/services/bareos.conf
-
-uninstall:
-	rm -f $(DESTDIR)$(SYSCONFDIR)/scripts/services/bareos
-	rm -f $(DESTDIR)$(SYSCONFDIR)/scripts/shared/applybareosdate
-	rm -f $(DESTDIR)$(SYSCONFDIR)/conf/logfiles/bareos.conf
-	rm -f $(DESTDIR)$(SYSCONFDIR)/conf/services/bareos.conf