projects / xscreensaver / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.37.tar.gz
[xscreensaver] / driver / Makefile.in
diff --git a/driver/Makefile.in b/driver/Makefile.in
index 225d1c021496ab86b96657a56ecdf61ffd6818ba..a570a270f5624d961b5d487388c87ebf1f48a5d1 100644 (file)
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
@@ -16,7 +16,7 @@ exec_prefix   = @exec_prefix@
 bindir         = @bindir@
 datarootdir    = @datarootdir@
 datadir                = @datadir@
-localedir      = $(datadir)/locale
+localedir      = @PO_DATADIR@/locale
 mandir         = @mandir@
 libexecdir     = @libexecdir@
 mansuffix      = 1
@@ -93,9 +93,7 @@ INCLUDES      = $(INCLUDES_1) @INCLUDES@
 MOTIF_SRCS     = demo-Xm.c demo-Xm-widgets.c
 MOTIF_OBJS     = demo-Xm.o demo-Xm-widgets.o
 
-GTK_SRCS       = demo-Gtk.c demo-Gtk-conf.c \
-                 demo-Gtk-widgets.c demo-Gtk-support.c
-GTK_EXTRA_OBJS  = demo-Gtk-widgets.o demo-Gtk-support.o
+GTK_SRCS       = demo-Gtk.c demo-Gtk-conf.c
 GTK_OBJS       = demo-Gtk.o demo-Gtk-conf.o @GTK_EXTRA_OBJS@
 
 PWENT_SRCS     = passwd-pwent.c
@@ -207,7 +205,7 @@ PDF2JPEG_LIBS       = -framework Cocoa
 SAVER_LIBS     = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \
                  $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \
                  -lXt -lX11 -lXext $(X_EXTRA_LIBS) \
-                 $(PASSWD_LIBS)
+                 $(PASSWD_LIBS) $(INTL_LIBS)
 
 CMD_LIBS       = $(LIBS) $(X_LIBS) \
                  $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS)
@@ -227,7 +225,6 @@ SCRIPTS             = $(SCRIPTS_1) @SCRIPTS_OSX@
 
 HDRS           = XScreenSaver_ad.h XScreenSaver_Xm_ad.h \
                  xscreensaver.h prefs.h remote.h exec.h \
-                 demo-Gtk-widgets.h demo-Gtk-stubs.h demo-Gtk-support.h \
                  demo-Gtk-conf.h auth.h mlstring.h types.h
 MEN_1          = xscreensaver.man xscreensaver-demo.man \
                  xscreensaver-command.man \
@@ -239,8 +236,8 @@ MEN_OSX             = xscreensaver-getimage-desktop.man pdf2jpeg.man
 MEN            = $(MEN_1) @MEN_OSX@
 
 EXTRAS         = README Makefile.in \
-                 XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam \
-                 xscreensaver-demo.glade2 xscreensaver-demo.glade2p \
+                 XScreenSaver.ad.in XScreenSaver-Xm.ad xscreensaver.pam.in \
+                 xscreensaver-demo.glade2.in xscreensaver-demo.glade2p \
                  screensaver-properties.desktop.in \
                  .gdbinit
 VMSFILES       = compile_axp.com compile_decc.com link_axp.com link_decc.com \
@@ -414,8 +411,8 @@ uninstall-man:
               rm -f $(install_prefix)$(manNdir)/$$instname* ;          \
        done
 
-install-pam:
-       @src="$(srcdir)/xscreensaver.pam" ;                             \
+install-pam: xscreensaver.pam
+       @src="xscreensaver.pam" ;                               \
        dest=`sed -n 's/.*PAM_SERVICE_NAME[     ]*"\([^"]*\)".*$$/\1/p' \
           < ../config.h` ;                                             \
        dir="$(install_prefix)$(PAM_DIR)" ;                             \
@@ -549,9 +546,9 @@ install-gnome:: xscreensaver-demo.glade2
                 $(INSTALL_DIRS) "$(install_prefix)$(GTK_GLADEDIR)"          ;\
          fi                                                                 ;\
          target=xscreensaver-demo.glade2                                    ;\
-         echo $(INSTALL_DATA) $(srcdir)/$$target                             \
+         echo $(INSTALL_DATA) $$target                             \
            $(install_prefix)$(GTK_GLADEDIR)/$$target                        ;\
-         if   $(INSTALL_DATA) $(srcdir)/$$target                             \
+         if   $(INSTALL_DATA) $$target                             \
            $(install_prefix)$(GTK_GLADEDIR)/$$target                        ;\
            then true                                                        ;\
           else                                                                \
@@ -661,7 +658,6 @@ distdepend: check_men update_ad_version XScreenSaver_ad.h XScreenSaver_Xm_ad.h
              -e 's@ $$(srcdir)/\(.*config\.h\)@ \1@g' ;                    \
          echo ''                                                           \
        ) > /tmp/distdepend.$$$$ &&                                         \
-       mv Makefile.in Makefile.in.bak &&                                   \
        mv /tmp/distdepend.$$$$ Makefile.in
 
 # Updates the version number in the app-defaults file to be in sync with 
@@ -673,11 +669,13 @@ update_ad_version::
   files="XScreenSaver.ad.in ../hacks/config/README ../OSX/bindist.rtf" ;    \
   U=$(UTILS_SRC)/version.h ;                                               \
   V=`sed -n 's/[^0-9]*\([0-9]\.[0-9][^. ]*\).*/\1/p' < $$U` ;              \
+  Y=`date '+%Y'` ;                                                         \
   D=`date '+%d-%b-%Y'` ;                                                   \
   for S in $$files ; do                                                            \
     T=/tmp/xs.$$$$ ;                                                       \
     sed -e "s/\(.*version \)[0-9][0-9]*\.[0-9]*[ab]*[0-9]*\(.*\)/\1$$V\2/"  \
         -e "s/\([0-9][0-9]-[A-Z][a-z][a-z]-[0-9][0-9][0-9]*\)/$$D/"        \
+        -e "s/\( [0-9][0-9][0-9][0-9]-\)[0-9][0-9][0-9][0-9] /\1$$Y /"     \
       < $$S > $$T ;                                                        \
     if cmp -s $$S $$T ; then                                               \
       true ;                                                               \
@@ -728,37 +726,44 @@ $(UTILS_BIN)/logo.o:              $(UTILS_SRC)/logo.c
 $(UTILS_BIN)/minixpm.o:                $(UTILS_SRC)/minixpm.c
 $(UTILS_BIN)/yarandom.o:       $(UTILS_SRC)/yarandom.c
 $(UTILS_BIN)/colorbars.o:      $(UTILS_SRC)/colorbars.c
+$(UTILS_BIN)/hsv.o:            $(UTILS_SRC)/hsv.c
+$(UTILS_BIN)/colors.o:         $(UTILS_SRC)/colors.c
+$(UTILS_BIN)/grabscreen.o:     $(UTILS_SRC)/grabscreen.c
 
-$(SAVER_UTIL_OBJS):
+UTIL_OBJS      = $(SAVER_UTIL_OBJS) $(UTILS_BIN)/colorbars.o \
+                 $(UTILS_BIN)/hsv.o $(UTILS_BIN)/colors.o \
+                 $(UTILS_BIN)/grabscreen.o
+
+$(UTIL_OBJS):
        cd $(UTILS_BIN) ; \
        $(MAKE) $(@F) CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
 
 # How we build object files in this directory.
 .c.o:
-       $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+       $(CC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
 
 .m.o:
-       $(OBJCC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $<
+       $(OBJCC) -c $(INCLUDES) $(DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) $<
 
 # subprocs takes an extra -D option.
 subprocs.o: subprocs.c
-       $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \
+       $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/subprocs.c
 
 # xscreensaver takes an extra -D option.
 xscreensaver.o: xscreensaver.c
-       $(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \
+       $(CC) -c $(INCLUDES) $(DEFS) $(INTL_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/xscreensaver.c
 
 # 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) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \
+         $(GTK_DEFS) $(INTL_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/demo-Gtk.c
 
 # demo-Gtk-conf takes an extra -D option.
 demo-Gtk-conf.o: demo-Gtk-conf.c
-       $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CFLAGS) $(X_CFLAGS) \
+       $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/demo-Gtk-conf.c
 
 
@@ -775,7 +780,7 @@ XScreenSaver_Xm_ad.h: XScreenSaver-Xm.ad
 # The executables linked in this directory.
 #
 xscreensaver: $(SAVER_OBJS)
-       $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS)
+       $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) $(INTL_LIBS)
 
 xscreensaver-command: $(CMD_OBJS)
        $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS)
@@ -861,7 +866,7 @@ test-screens: test-screens.o
 
 
 xdpyinfo.o: xdpyinfo.c
-       $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \
+       $(CC) -c $(INCLUDES) -DHAVE_GLX $(CPPFLAGS) $(CFLAGS) $(X_CFLAGS) \
          $(srcdir)/xdpyinfo.c
 
 xdpyinfo: xdpyinfo.o
@@ -880,8 +885,6 @@ demo-Gtk-conf.o: $(UTILS_SRC)/xscreensaver-intl.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)/types.h
@@ -890,12 +893,6 @@ demo-Gtk.o: $(UTILS_SRC)/usleep.h
 demo-Gtk.o: $(UTILS_SRC)/version.h
 demo-Gtk.o: $(UTILS_SRC)/visual.h
 demo-Gtk.o: $(UTILS_SRC)/xscreensaver-intl.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-support.h
-demo-Gtk-widgets.o: $(srcdir)/demo-Gtk-widgets.h
 demo-Xm.o: ../config.h
 demo-Xm-widgets.o: ../config.h
 dpms.o: ../config.h
@@ -922,6 +919,7 @@ prefs.o: ../config.h
 prefs.o: $(srcdir)/prefs.h
 prefs.o: $(srcdir)/types.h
 prefs.o: $(UTILS_SRC)/resources.h
+prefs.o: $(UTILS_SRC)/version.h
 remote.o: ../config.h
 remote.o: $(srcdir)/remote.h
 screens.o: ../config.h
Archive of old xscreensaver versions (http://www.jwz.org/xscreensaver/)