1997-06-13 17:29:53 +00:00
|
|
|
*** modules/FvwmAudio/Makefile.in.orig Tue Sep 10 22:25:33 1996
|
1997-06-13 17:43:12 +00:00
|
|
|
--- modules/FvwmAudio/Makefile.in Fri Jun 13 21:41:10 1997
|
1997-06-13 17:29:53 +00:00
|
|
|
***************
|
|
|
|
|
*** 10,15 ****
|
|
|
|
|
--- 10,17 ----
|
|
|
|
|
bin_dir=@exec_prefix@/bin
|
|
|
|
|
x_includes=@x_includes@
|
|
|
|
|
x_libraries=@x_libraries@
|
|
|
|
|
+ libdir=@libdir@
|
|
|
|
|
+ includedir=@includedir@
|
|
|
|
|
fvwm_icons=@fvwm_icons@
|
|
|
|
|
fvwm_rc=@fvwm_rc@
|
|
|
|
|
fvwm_name=@fvwm_name@
|
|
|
|
|
***************
|
|
|
|
|
*** 24,34 ****
|
|
|
|
|
XEXT_LIBRARY=-lXext
|
|
|
|
|
FVWM_LIBRARY=-l${fvwm_name}
|
|
|
|
|
RPLAY_LIBRARY=-lrplay
|
|
|
|
|
! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY}
|
|
|
|
|
|
|
|
|
|
! EXTRA_DEFINES=-DXPM -DSHAPE
|
|
|
|
|
CC=@CC@
|
|
|
|
|
! INCLUDES=-I${top_srcdir}/include ${x_includes}
|
|
|
|
|
CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES}
|
|
|
|
|
MAKEDEPEND=@MAKEDEPEND@
|
|
|
|
|
INSTALL=@INSTALL@
|
|
|
|
|
--- 26,36 ----
|
|
|
|
|
XEXT_LIBRARY=-lXext
|
|
|
|
|
FVWM_LIBRARY=-l${fvwm_name}
|
|
|
|
|
RPLAY_LIBRARY=-lrplay
|
|
|
|
|
! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY}
|
|
|
|
|
|
|
|
|
|
! EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY
|
|
|
|
|
CC=@CC@
|
1997-06-13 17:43:12 +00:00
|
|
|
! INCLUDES=-I${top_srcdir}/include ${x_includes} -I${includedir}
|
1997-06-13 17:29:53 +00:00
|
|
|
CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES}
|
|
|
|
|
MAKEDEPEND=@MAKEDEPEND@
|
|
|
|
|
INSTALL=@INSTALL@
|
