projects / xscreensaver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.03.tar.gz
[xscreensaver] / driver / Makefile.in
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 2df4f3ea5dbdbf6d11e9deeaa2eb3981f1cd9538..fde4e63cfcbf0cd77e2664a52f1eb653114b2579 100644 (file)
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -7,6 +7,8 @@
 
 srcdir         = @srcdir@
 VPATH          = @srcdir@
+top_srcdir     = @top_srcdir@
+top_builddir   = ..
 
 install_prefix =
 prefix         = @prefix@
@@ -15,10 +17,13 @@ bindir              = @bindir@
 mandir         = @mandir@
 man1dir                = $(mandir)/man1
 mansuffix      = 1
+datadir                = @datadir@
+localedir      = $(datadir)/locale
+
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
 
 GNOME_DATADIR  = @GNOME_DATADIR@
-GNOME_CCDIR_1  = $(GNOME_DATADIR)/control-center/Desktop
-GNOME_CCDIR_2  = $(GNOME_DATADIR)/control-center/capplets
+GNOME_CCDIR    = $(GNOME_DATADIR)/control-center/Desktop
 GNOME_PANELDIR = $(GNOME_DATADIR)/gnome/apps/Settings/Desktop
 GNOME_BINDIR   = $(bindir)
 HACK_CONF_DIR  = @HACK_CONF_DIR@
@@ -28,11 +33,13 @@ CC          = @CC@
 CFLAGS         = @CFLAGS@
 LDFLAGS                = @LDFLAGS@
 DEFS           = @DEFS@
+INTL_DEFS      = -DLOCALEDIR=\"$(localedir)\"
 SUBP_DEFS      = $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"'
 GTK_DEFS       = $(DEFS) -DDEFAULT_ICONDIR='"$(GTK_ICONDIR)"'
 CONF_DEFS      = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"'
 
 LIBS           = @LIBS@
+INTL_LIBS      = @INTLLIBS@
 PERL           = @PERL@
 
 DEPEND         = @DEPEND@
@@ -429,33 +436,19 @@ install-gnome:: screensaver-properties.desktop
        @lost=""                                                             ;\
          if [ "$(GNOME_DATADIR)" != "" ]; then                                \
                                                                              \
-           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_1)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_1)"        ;\
-           fi                                                                ;\
-           if [ ! -d "$(install_prefix)$(GNOME_CCDIR_2)" ]; then              \
-             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
-                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR_2)"        ;\
-           fi                                                                ;\
-                                                                             \
-           echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
-                                                                             \
-           if      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_1)/screensaver-properties.desktop;\
-             then true                                                       ;\
-           else                                                               \
-             lost="$$lost $(install_prefix)$(GNOME_CCDIR_1)"                 ;\
+           if [ ! -d "$(install_prefix)$(GNOME_CCDIR)" ]; then                \
+             echo $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
+                  $(INSTALL_DIRS) "$(install_prefix)$(GNOME_CCDIR)"          ;\
            fi                                                                ;\
                                                                              \
-           echo    $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop           ;\
+           echo    $(INSTALL_DATA) screensaver-properties.desktop            \
+             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
                                                                              \
-           if      $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop   \
-             $(install_prefix)$(GNOME_CCDIR_2)/screensaver.desktop           ;\
+           if      $(INSTALL_DATA) screensaver-properties.desktop            \
+             $(install_prefix)$(GNOME_CCDIR)/screensaver-properties.desktop;  \
              then true                                                       ;\
            else                                                               \
-             lost="$$lost $(install_prefix)$(GNOME_CCDIR_2)"                 ;\
+             lost="$$lost $(install_prefix)$(GNOME_CCDIR)"                   ;\
            fi                                                                ;\
                                                                              \
            if [ ! -d "$(install_prefix)$(GNOME_PANELDIR)" ]; then             \
@@ -463,9 +456,9 @@ install-gnome:: screensaver-properties.desktop
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_PANELDIR)"       ;\
            fi                                                                ;\
                                                                              \
-           echo $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
+           echo $(INSTALL_DATA) screensaver-properties.desktop               \
                         $(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
-           if   $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop      \
+           if   $(INSTALL_DATA) screensaver-properties.desktop               \
        $(install_prefix)$(GNOME_PANELDIR)/screensaver-properties.desktop     ;\
              then true                                                       ;\
            else                                                               \
@@ -494,9 +487,9 @@ install-gnome:: screensaver-properties-capplet
                   $(INSTALL_DIRS) "$(install_prefix)$(GNOME_BINDIR)"         ;\
            fi                                                                ;\
           program=screensaver-properties-capplet                            ;\
-          echo $(INSTALL_SCRIPT) $$program                                   \
+          echo $(INSTALL_SCRIPT) $(srcdir)/$$program                         \
                  $(install_prefix)$(GNOME_BINDIR)/$$program                 ;\
-          if   $(INSTALL_SCRIPT) $$program                                   \
+          if   $(INSTALL_SCRIPT) $(srcdir)/$$program                         \
                  $(install_prefix)$(GNOME_BINDIR)/$$program                 ;\
              then true                                                       ;\
            else                                                               \
@@ -618,7 +611,7 @@ clean:
        -rm -f *.o a.out core $(EXES) $(EXES2) $(TEST_EXES) XScreenSaver_ad.h
 
 distclean: clean
-       -rm -f Makefile XScreenSaver.ad TAGS *~ "#"*
+       -rm -f Makefile XScreenSaver.ad TAGS *~ "#"* screensaver-properties.desktop
 
 # Adds all current dependencies to Makefile
 depend: XScreenSaver_ad.h
@@ -635,13 +628,16 @@ distdepend: update_ad_version update_man_version XScreenSaver_ad.h
        @echo updating dependencies in `pwd`/Makefile.in... ;               \
        $(DEPEND) -w 0 -f -                                                 \
        -s '# DO NOT DELETE: updated by make distdepend' $(DEPEND_FLAGS) -- \
-       $(INCLUDES) $(DEFS) $(DEPEND_DEFINES) $(CFLAGS) $(X_CFLAGS) --      \
+       $(INCLUDES) -I$(ICON_SRC) $(DEFS) $(DEPEND_DEFINES)                 \
+       $(CFLAGS) $(X_CFLAGS) --                                            \
        $(SAVER_SRCS_1) $(MOTIF_SRCS) $(GTK_SRCS) $(GETIMG_SRCS_1)          \
        $(PWENT_SRCS) $(LOCK_SRCS_1) $(DEMO_SRCS_1) $(CMD_SRCS)             \
-       $(TEST_SRCS) |                                                      \
+       $(TEST_SRCS) 2>/dev/null |                                          \
+       sort -d |                                                           \
        (                                                                   \
          awk '/^# .*Makefile.in ---/,/^# DO .*distdepend/' < Makefile.in ; \
-         sed -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'                        \
+         sed -e '/^#.*/d'                                                  \
+             -e 's@ \./@ @g;s@ /[^ ]*@@g;/^.*:$$/d'                        \
              -e 's@\.\./utils@$$(UTILS_SRC)@g'                             \
              -e 's@ \([^$$]\)@ $$(srcdir)/\1@g'                            \
              -e 's@$$.*\(XScreenSaver_ad\)@\1@g'                           \
@@ -729,10 +725,10 @@ subprocs.o: subprocs.c
        $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/subprocs.c
 
-# demo-Gtk takes an extra -D option, and an extra -I option.
+# demo-Gtk takes extra -D options, and an extra -I option.
 demo-Gtk.o: demo-Gtk.c
-       $(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) $(GTK_DEFS) \
-         $(CFLAGS) $(X_CFLAGS) \
+       $(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) \
+         $(GTK_DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/demo-Gtk.c
 
 # demo-Gtk-conf takes an extra -D option.
@@ -746,11 +742,7 @@ demo-Gtk-conf.o: demo-Gtk-conf.c
 XScreenSaver_ad.h: XScreenSaver.ad
        $(SHELL) $(UTILS_SRC)/ad2c XScreenSaver.ad > XScreenSaver_ad.h
 
-screensaver-properties.desktop: screensaver-properties.desktop.in Makefile
-       @echo generating $@... ;                                        \
-       sed "s%[@]bindir[@]%${bindir}%g"                                \
-         < ${srcdir}/screensaver-properties.desktop.in                 \
-         > $@
+@INTLTOOL_DESKTOP_RULE@
 
 # The executables linked in this directory.
 #
@@ -767,13 +759,13 @@ xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@
 
 xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \
-       $(MOTIF_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \
-       $(X_EXTRA_LIBS)
+       $(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \
+       $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
 
 xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \
-       $(GTK_LIBS) $(XML_LIBS) $(X_PRE_LIBS) -lXt -lX11 $(XDPMS_LIBS) -lXext \
-       $(X_EXTRA_LIBS)
+       $(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \
+       $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS)
 
 xscreensaver-getimage: $(GETIMG_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm
@@ -818,80 +810,79 @@ xdpyinfo: xdpyinfo.o
 ##############################################################################
 #
 # DO NOT DELETE: updated by make distdepend
-# $(srcdir)/DO $(srcdir)/NOT $(srcdir)/DELETE: $(srcdir)/updated $(srcdir)/by $(srcdir)/make $(srcdir)/distdepend
 
-xscreensaver.o: ../config.h
-xscreensaver.o: $(srcdir)/xscreensaver.h
-xscreensaver.o: $(srcdir)/prefs.h
-xscreensaver.o: XScreenSaver_ad.h
-windows.o: ../config.h
-windows.o: $(srcdir)/xscreensaver.h
-windows.o: $(srcdir)/prefs.h
-timers.o: ../config.h
-timers.o: $(srcdir)/xscreensaver.h
-timers.o: $(srcdir)/prefs.h
-subprocs.o: ../config.h
-subprocs.o: $(srcdir)/xscreensaver.h
-subprocs.o: $(srcdir)/prefs.h
-exec.o: ../config.h
-xset.o: ../config.h
-xset.o: $(srcdir)/xscreensaver.h
-xset.o: $(srcdir)/prefs.h
-splash.o: ../config.h
-splash.o: $(srcdir)/xscreensaver.h
-splash.o: $(srcdir)/prefs.h
-setuid.o: ../config.h
-setuid.o: $(srcdir)/xscreensaver.h
-setuid.o: $(srcdir)/prefs.h
-stderr.o: ../config.h
-stderr.o: $(srcdir)/xscreensaver.h
-stderr.o: $(srcdir)/prefs.h
-demo-Xm.o: ../config.h
-demo-Xm.o: $(srcdir)/prefs.h
-demo-Xm.o: $(srcdir)/remote.h
-demo-Xm.o: XScreenSaver_ad.h
-demo-Xm-widgets.o: ../config.h
+demo-Gtk-conf.o: ../config.h
+demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h
+demo-Gtk.o: XScreenSaver_ad.h
 demo-Gtk.o: ../config.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-support.h
+demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
 demo-Gtk.o: $(srcdir)/prefs.h
 demo-Gtk.o: $(srcdir)/remote.h
-demo-Gtk.o: $(srcdir)/demo-Gtk-widgets.h
-demo-Gtk.o: $(srcdir)/demo-Gtk-support.h
-demo-Gtk.o: $(srcdir)/demo-Gtk-conf.h
-demo-Gtk.o: XScreenSaver_ad.h
-demo-Gtk-conf.o: ../config.h
-demo-Gtk-conf.o: $(srcdir)/demo-Gtk-conf.h
+demo-Gtk-support.o: ../config.h
+demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h
 demo-Gtk-widgets.o: ../config.h
 demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-stubs.h
-demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
 demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-support.h
-demo-Gtk-support.o: ../config.h
-demo-Gtk-support.o: $(srcdir)/demo-Gtk-support.h
-xscreensaver-getimage.o: ../config.h
-xscreensaver-getimage.o: $(srcdir)/prefs.h
-xscreensaver-getimage.o: XScreenSaver_ad.h
-passwd-pwent.o: ../config.h
+demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
+demo-Xm.o: XScreenSaver_ad.h
+demo-Xm.o: ../config.h
+demo-Xm.o: $(srcdir)/prefs.h
+demo-Xm.o: $(srcdir)/remote.h
+demo-Xm-widgets.o: ../config.h
+dpms.o: ../config.h
+dpms.o: $(srcdir)/prefs.h
+dpms.o: $(srcdir)/xscreensaver.h
+exec.o: ../config.h
 lock.o: ../config.h
-lock.o: $(srcdir)/xscreensaver.h
 lock.o: $(srcdir)/prefs.h
+lock.o: $(srcdir)/xscreensaver.h
 passwd.o: ../config.h
+passwd-pwent.o: ../config.h
 prefs.o: ../config.h
 prefs.o: $(srcdir)/prefs.h
-dpms.o: ../config.h
-dpms.o: $(srcdir)/xscreensaver.h
-dpms.o: $(srcdir)/prefs.h
 remote.o: ../config.h
 remote.o: $(srcdir)/remote.h
-xscreensaver-command.o: ../config.h
-xscreensaver-command.o: $(srcdir)/remote.h
+setuid.o: ../config.h
+setuid.o: $(srcdir)/prefs.h
+setuid.o: $(srcdir)/xscreensaver.h
+splash.o: ../config.h
+splash.o: $(srcdir)/prefs.h
+splash.o: $(srcdir)/xscreensaver.h
+stderr.o: ../config.h
+stderr.o: $(srcdir)/prefs.h
+stderr.o: $(srcdir)/xscreensaver.h
+subprocs.o: ../config.h
+subprocs.o: $(srcdir)/prefs.h
+subprocs.o: $(srcdir)/xscreensaver.h
+test-apm.o: ../config.h
+test-fade.o: ../config.h
+test-fade.o: $(srcdir)/prefs.h
+test-fade.o: $(srcdir)/xscreensaver.h
+test-grab.o: ../config.h
+test-passwd.o: XScreenSaver_ad.h
 test-passwd.o: ../config.h
-test-passwd.o: $(srcdir)/xscreensaver.h
 test-passwd.o: $(srcdir)/prefs.h
-test-passwd.o: XScreenSaver_ad.h
+test-passwd.o: $(srcdir)/xscreensaver.h
 test-uid.o: ../config.h
 test-xdpms.o: ../config.h
-test-grab.o: ../config.h
-test-apm.o: ../config.h
-test-fade.o: ../config.h
-test-fade.o: $(srcdir)/xscreensaver.h
-test-fade.o: $(srcdir)/prefs.h
+timers.o: ../config.h
+timers.o: $(srcdir)/prefs.h
+timers.o: $(srcdir)/xscreensaver.h
+windows.o: ../config.h
+windows.o: $(srcdir)/prefs.h
+windows.o: $(srcdir)/xscreensaver.h
+xscreensaver-command.o: ../config.h
+xscreensaver-command.o: $(srcdir)/remote.h
+xscreensaver-getimage.o: ../config.h
+xscreensaver-getimage.o: XScreenSaver_ad.h
+xscreensaver-getimage.o: $(srcdir)/prefs.h
+xscreensaver.o: XScreenSaver_ad.h
+xscreensaver.o: ../config.h
+xscreensaver.o: $(srcdir)/prefs.h
+xscreensaver.o: $(srcdir)/xscreensaver.h
+xset.o: ../config.h
+xset.o: $(srcdir)/prefs.h
+xset.o: $(srcdir)/xscreensaver.h
 
Archive of old xscreensaver versions (http://www.jwz.org/xscreensaver/)