Group :: Gráficos
RPM: xmrm
Navegação
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: xmrm.Makefile.patch
Download
Download
Mon Feb 20 21:49:52 MSK 2006 george@arnor.homeunix.org
* Makefile XOrg7 adaptation
Mon Feb 20 20:17:45 MSK 2006 george@arnor.homeunix.org
* Eliminating GX* and zero linewidth
Tue Dec 20 13:54:19 MSK 2005 george@arnor.homeunix.org
* -I/usr/X11R6/include/X11
Tue Dec 20 12:57:10 MSK 2005 george@arnor.homeunix.org
* Remove unused libraries
Tue Dec 20 12:04:31 MSK 2005 george@arnor.homeunix.org
* Eliminate fake image creations
Tue Dec 20 11:52:37 MSK 2005 george@arnor.homeunix.org
* Unhack BSD sspecifics
Tue Dec 20 11:37:56 MSK 2005 george@arnor.homeunix.org
* patch-xmrm*
Tue Dec 20 11:37:18 MSK 2005 george@arnor.homeunix.org
* patch-io.cc
Tue Dec 20 11:37:06 MSK 2005 george@arnor.homeunix.org
* patch-const.h
Tue Dec 20 11:36:54 MSK 2005 george@arnor.homeunix.org
* patch-af
Tue Dec 20 11:36:45 MSK 2005 george@arnor.homeunix.org
* patch-ad
Tue Dec 20 11:36:22 MSK 2005 george@arnor.homeunix.org
* patch-Makefile
--- old-xmrm/Makefile 2006-02-20 21:51:48 +0300
+++ new-xmrm/Makefile 2006-02-20 21:51:48 +0300
@@ -16,8 +16,10 @@
#
##############################################################################
-CPP = g++
-CC = gcc
+CPP = c++
+CC = cc
+PREFIX=/usr
+LOCALBASE=/usr
# -c: don't link yet
# -g: produce debugging-information, don't use together with link_flag -s
@@ -28,15 +30,17 @@
# -c: don't link yet
#COMPILE_FLAGS = -O3 -m486 -c
+XFORMSINC = -I${PREFIX}/include/xforms+
# -O: normal optimization level -c: don't link yet
-COMPILE_FLAGS = -O -c
+COMPILE_FLAGS = ${CFLAGS} -I${LOCALBASE}/include -I${PREFIX}/include ${XFORMSINC} -c# -s: DESTROYS symbol-table
-LINK_FLAGS = -s
+#LINK_FLAGS = -s
-SYSLIB = -L/usr/X11R6/lib -lX11 -lm
-LIBS = -L/usr/lib -ltiff -ljpeg -lgz -lforms -lXpm $(SYSLIB)
+SYSLIB = -L${PREFIX}/lib -lX11 -lm+LIBS = -L${LOCALBASE}/lib -ltiff -lforms $(SYSLIB)OBJECTS = xmrm.o xmrm_cb.o io.o morphvec.o init.o wavemorph.o wave_rts.o wave.o\
areas.o xmrm_main.o
@@ -46,14 +50,14 @@
all: xmrm xmrm_mpeg
xmrm: $(OBJECTS)
- $(CC) $(LINK_FLAGS) -o xmrm $(OBJECTS) $(LIBS)
+ $(CPP) $(LINK_FLAGS) -o xmrm $(OBJECTS) $(LIBS)
xmrm_mpeg: xmrm_mpeg.o xmrm_mpeg_main.o
- $(CC) $(LINK_FLAGS) -o xmrm_mpeg xmrm_mpeg.o xmrm_mpeg_main.o $(LIBS)
+ $(CPP) $(LINK_FLAGS) -o xmrm_mpeg xmrm_mpeg.o xmrm_mpeg_main.o $(LIBS)
static: $(OBJECTS) xmrm_mpeg.o xmrm_mpeg_main.o
- $(CC) $(LINK_FLAGS) -o xmrm $(OBJECTS) $(LIBS) -static
- $(CC) $(LINK_FLAGS) -o xmrm_mpeg xmrm_mpeg.o xmrm_mpeg_main.o $(LIBS) -static
+ $(CPP) $(LINK_FLAGS) -o xmrm $(OBJECTS) $(LIBS) -static
+ $(CPP) $(LINK_FLAGS) -o xmrm_mpeg xmrm_mpeg.o xmrm_mpeg_main.o $(LIBS) -static
@echo
@echo "REMOVE 'xmrm' AND 'xmrm_mpeg' BEFORE YOUR NEXT 'make all|dynamic' !!!"
@echo
@@ -94,6 +98,15 @@
xmrm_mpeg_main.o: xmrm_mpeg_main.cc xmrm_mpeg.h
$(CPP) $(COMPILE_FLAGS) xmrm_mpeg_main.cc
+patchset:
+ @darcs changes -s --from-patch=patch-Makefile | \
+ sed -n '/^ . [.][/]/s/^ . [.][/]\([^ ]*\).*/\1/p' | \
+ sort -u | while read F; do \
+ P=xmrm.$$F.patch; \
+ darcs diff -u --from-patch=patch-Makefile $$F > $$P; \
+ echo "Patch$$((0+0$$L)): $$P"; L=$$((0$$L+1)); \
+ done
+
clean:
-rm -f *.bak *.ESV *.o core a.out *~ xmrmdesign.c xmrmdesign_cb.c xmrmdesign_main.c xmrmdesign.h
-rm -f xmrm_mpegdesign.c xmrm_mpegdesign_main.c xmrm_mpegdesign.h
@@ -101,3 +114,4 @@
empty:
-rm -f *.bak *.ESV *.o core a.out *~ xmrmdesign.c xmrmdesign_cb.c xmrmdesign_main.c xmrmdesign.h
-rm -f xmrm xmrm_mpeg xmrm_mpegdesign.c xmrm_mpegdesign_main.c xmrm_mpegdesign.h
+ -rm -f *tiff o oo ooo *.patch