You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
178 lines
5.0 KiB
178 lines
5.0 KiB
diff -ruN system-config-printer-1.3.12/Makefile.am my/Makefile.am
|
|
--- system-config-printer-1.3.12/Makefile.am 2012-10-04 15:51:04.000000000 +0200
|
|
+++ my/Makefile.am 2012-11-06 03:48:12.392483514 +0100
|
|
@@ -1,4 +1,4 @@
|
|
-CFLAGS=-g -O2 -Wall
|
|
+CFLAGS=-Wall
|
|
|
|
SUBDIRS=po
|
|
|
|
@@ -84,88 +84,21 @@
|
|
rm -f .stamp-distutils-in-builddir
|
|
|
|
nobase_pkgdata_SCRIPTS= \
|
|
- check-device-ids.py \
|
|
- pysmb.py \
|
|
- scp-dbus-service.py \
|
|
- system-config-printer.py \
|
|
- troubleshoot/__init__.py \
|
|
- applet.py
|
|
+ check-device-ids.py
|
|
|
|
nobase_pkgdata_DATA= \
|
|
- asyncconn.py \
|
|
- asyncipp.py \
|
|
- asyncpk1.py \
|
|
- authconn.py \
|
|
config.py \
|
|
- cupspk.py \
|
|
debug.py \
|
|
dnssdresolve.py \
|
|
- errordialogs.py \
|
|
- HIG.py \
|
|
firewall.py \
|
|
- gui.py \
|
|
- gtkinklevel.py \
|
|
- gtkspinner.py \
|
|
installpackage.py \
|
|
- jobviewer.py \
|
|
monitor.py \
|
|
- newprinter.py \
|
|
- options.py \
|
|
- optionwidgets.py \
|
|
PhysicalDevice.py \
|
|
- ppdcache.py \
|
|
ppdippstr.py \
|
|
- ppdsloader.py \
|
|
- printerproperties.py \
|
|
probe_printer.py \
|
|
- gtk_label_autowrap.py \
|
|
SearchCriterion.py \
|
|
- serversettings.py \
|
|
smburi.py \
|
|
statereason.py \
|
|
- timedops.py \
|
|
- ToolbarSearchEntry.py \
|
|
- userdefault.py \
|
|
- ui/AboutDialog.ui \
|
|
- ui/ConnectDialog.ui \
|
|
- ui/ConnectingDialog.ui \
|
|
- ui/InstallDialog.ui \
|
|
- ui/JobsWindow.ui \
|
|
- ui/NewPrinterName.ui \
|
|
- ui/NewPrinterWindow.ui \
|
|
- ui/PrinterPropertiesDialog.ui \
|
|
- ui/PrintersWindow.ui \
|
|
- ui/ServerSettingsDialog.ui \
|
|
- ui/SMBBrowseDialog.ui \
|
|
- ui/statusicon_popupmenu.ui \
|
|
- ui/WaitWindow.ui \
|
|
- icons/i-network-printer.png \
|
|
- troubleshoot/base.py \
|
|
- troubleshoot/CheckLocalServerPublishing.py \
|
|
- troubleshoot/CheckNetworkServerSanity.py \
|
|
- troubleshoot/CheckPPDSanity.py \
|
|
- troubleshoot/CheckPrinterSanity.py \
|
|
- troubleshoot/CheckSELinux.py \
|
|
- troubleshoot/CheckUSBPermissions.py \
|
|
- troubleshoot/ChooseNetworkPrinter.py \
|
|
- troubleshoot/ChoosePrinter.py \
|
|
- troubleshoot/DeviceListed.py \
|
|
- troubleshoot/ErrorLogCheckpoint.py \
|
|
- troubleshoot/ErrorLogFetch.py \
|
|
- troubleshoot/ErrorLogParse.py \
|
|
- troubleshoot/Locale.py \
|
|
- troubleshoot/LocalOrRemote.py \
|
|
- troubleshoot/NetworkCUPSPrinterShared.py \
|
|
- troubleshoot/PrinterStateReasons.py \
|
|
- troubleshoot/PrintTestPage.py \
|
|
- troubleshoot/QueueNotEnabled.py \
|
|
- troubleshoot/QueueRejectingJobs.py \
|
|
- troubleshoot/RemoteAddress.py \
|
|
- troubleshoot/SchedulerNotRunning.py \
|
|
- troubleshoot/ServerFirewalled.py \
|
|
- troubleshoot/Shrug.py \
|
|
- troubleshoot/VerifyPackages.py \
|
|
- troubleshoot/Welcome.py \
|
|
xml/preferreddrivers.rng \
|
|
xml/validate.py
|
|
|
|
@@ -173,18 +106,13 @@
|
|
cupshelpers_DATA=\
|
|
xml/preferreddrivers.xml
|
|
|
|
-bin_SCRIPTS= \
|
|
- system-config-printer \
|
|
- system-config-printer-applet \
|
|
- dbus/scp-dbus-service
|
|
-
|
|
if UDEV_RULES
|
|
udevrulesdir=$(sysconfdir)/udev/rules.d
|
|
udevrules_DATA=udev/70-printers.rules
|
|
udev_udev_configure_printer_SOURCES=\
|
|
udev/udev-configure-printer.c
|
|
-udev_udev_configure_printer_LDADD= -lcups -ludev $(libusb_LIBS) $(GLIB_LIBS)
|
|
-udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
|
|
+udev_udev_configure_printer_LDADD= -lcups $(libudev_LIBS) $(libusb_LIBS) $(GLIB_LIBS)
|
|
+udev_udev_configure_printer_CFLAGS= $(AM_CFLAGS) $(libudev_CFLAGS) $(libusb_CFLAGS) $(GLIB_CFLAGS)
|
|
udevhelperdir=$(sysconfdir)/udev
|
|
udevhelper_PROGRAMS=\
|
|
udev/udev-configure-printer
|
|
@@ -202,56 +130,17 @@
|
|
|
|
endif
|
|
|
|
-man_MANS= \
|
|
- man/system-config-printer.1 \
|
|
- man/system-config-printer-applet.1
|
|
-
|
|
dbus_DATA = \
|
|
dbus/com.redhat.NewPrinterNotification.conf \
|
|
dbus/com.redhat.PrinterDriversInstaller.conf
|
|
dbusdir = $(sysconfdir)/dbus-1/system.d/
|
|
|
|
-dbusinterfaces_DATA = \
|
|
- dbus/org.fedoraproject.Config.Printing.xml
|
|
-dbusinterfacesdir = $(datadir)/dbus-1/interfaces/
|
|
-
|
|
-dbusservices_DATA = \
|
|
- dbus/org.fedoraproject.Config.Printing.service
|
|
-dbusservicesdir = $(datadir)/dbus-1/services/
|
|
-
|
|
-desktop_DATA =\
|
|
- system-config-printer.desktop \
|
|
- print-applet.desktop
|
|
desktopdir = $(datadir)/applications/
|
|
autostartdir = $(sysconfdir)/xdg/autostart/
|
|
|
|
DESKTOP_VENDOR=@DESKTOPVENDOR@
|
|
DESKTOP_PREFIX=@DESKTOPPREFIX@
|
|
|
|
-install-desktopDATA: $(desktop_DATA)
|
|
- mkdir -p $(DESTDIR)$(desktopdir)
|
|
- mkdir -p $(DESTDIR)$(desktopdir)
|
|
- desktop-file-install $(DESKTOP_VENDOR) \
|
|
- --dir $(DESTDIR)$(desktopdir) \
|
|
- --add-category System \
|
|
- --add-category Settings \
|
|
- --add-category HardwareSettings \
|
|
- --add-category Printing \
|
|
- --add-category GTK \
|
|
- system-config-printer.desktop
|
|
- desktop-file-install $(DESKTOP_VENDOR) \
|
|
- --dir $(DESTDIR)$(autostartdir) \
|
|
- --add-category System \
|
|
- --add-category Monitor \
|
|
- --add-category GTK \
|
|
- print-applet.desktop
|
|
-
|
|
-uninstall-desktopDATA:
|
|
- rm -f $(DESTDIR)$(desktopdir)/$(DESKTOP_PREFIX)system-config-printer.desktop
|
|
- rm -f $(DESTDIR)$(autostartdir)/$(DESKTOP_PREFIX)print-applet.desktop
|
|
-
|
|
-desktop_in_files = $(desktop_DATA:.desktop=.desktop.in)
|
|
-
|
|
EXTRA_DIST=\
|
|
$(nobase_pkgdata_SCRIPTS) \
|
|
$(nobase_pkgdata_DATA) \
|