1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-04 22:33:27 +00:00
freebsd-ports/multimedia/mpegedit/files/patch-aj
Alexander Langer 0d731daf26 - Support CC/CXX/CFLAGS/CXXFLAGS/MAKE properly
- Support NOPORTDOCS
- Remove USE_GMAKE
- Add WWW: line into pkg/DESCR
- Add pnm.1 LIB_DEPENDS

PR:		19344
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>
2000-06-28 13:34:38 +00:00

100 lines
3.1 KiB
Plaintext

--- Makefile.orig Mon Jul 24 01:00:40 1995
+++ Makefile Thu Jun 15 08:53:48 2000
@@ -23,8 +23,8 @@
#
# Mr A S R Ashley B.Eng (Hons) 23rd July 1995
- CC = gcc
- CPP = g++
+# CC = gcc
+ CPP = ${CXX}
RM = rm -f
DEPFILE = Dependancies
@@ -33,7 +33,7 @@
SOURCES = main.C globals/version.c
OBJS = main.o globals/version.o
ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a
- LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm
+ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm
#
# CPPFLAGS -Wall all warnings
# -pipe speeds up compilation (remove only if not using g++)
@@ -55,11 +55,11 @@
# PBMDIR The location of the pbmplus header files, which is
# /usr/include/gr on my Linux machine.
-PBMDIR = /usr/include/X11R5/X11
+PBMDIR = $(LOCALBASE)/include
INCLUDES = -Iglobals -Iui -IMpegCodec -IMpegCodec/decoder \
- -IMpegCodec/encoder -Ieditor
-CPPFLAGS = -Wall -pipe -O4
-CFLAGS = -Wall -pipe -O4
+ -IMpegCodec/encoder -Ieditor -I$(X11BASE)/include
+CPPFLAGS = ${CXXFLAGS}
+#CFLAGS = -Wall -pipe -O4
SHMEM = -DSH_MEM
CACHE_FLAGS = -DCACHE_SIZE=12288 -DCACHE_GRANULARITY=5
@@ -70,22 +70,22 @@
all: mpeg_edit
-ui.a:
- cd ui && make ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+ui/ui.a:
+ cd ui && $(MAKE) ui.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" && cd ..
-mpeg.a:
- cd MpegCodec && make mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+MpegCodec/mpeg.a:
+ cd MpegCodec && $(MAKE) mpeg.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" CACHE_FLAGS="$(CACHE_FLAGS)" && cd ..
-editor.a:
- cd editor && make editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
+editor/editor.a:
+ cd editor && $(MAKE) editor.a EXTRA="$(EXTRA)" CPPFLAGS="$(CPPFLAGS)" \
CFLAGS="$(CFLAGS)" SHMEM="$(SHMEM)" PBMDIR="$(PBMDIR)" && cd ..
-mpeg_edit: ui.a mpeg.a editor.a $(DEPFILE) $(OBJS)
+mpeg_edit: $(ARCHIVES) $(DEPFILE) $(OBJS)
$(CPP) -o mpeg_edit $(OBJS) $(ARCHIVES) $(LIBS)
-ppmtorle: mpeg.a editor.a $(DEPFILE) ppmtorle.o
+ppmtorle: MpegCodec/mpeg.a editor/editor.a $(DEPFILE) ppmtorle.o
$(CPP) -o ppmtorle ppmtorle.o MpegCodec/frame.o editor/yuv.o $(LIBS)
globals/version.o: $(ARCHIVES)
@@ -93,24 +93,24 @@
clean:
$(RM) mpeg_edit main.o globals/version.o
- set -e; for i in $(SUBDIRS); do cd $$i && make clean && cd .. ; done
+ set -e; for i in $(SUBDIRS); do cd $$i && $(MAKE) clean && cd .. ; done
dep: FORCE
- set -e; for i in $(SUBDIRS) ; do cd $$i && make dep EXTRA="$(EXTRA)" \
+ set -e; for i in $(SUBDIRS) ; do cd $$i && $(MAKE) dep EXTRA="$(EXTRA)" \
CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" SHMEM="$(SHMEM)" \
PBMDIR="$(PBMDIR)" && cd .. ; done
$(RM) $(DEPFILE)
- make $(DEPFILE)
+ $(MAKE) $(DEPFILE)
FORCE:
$(DEPFILE):
set -e; for i in $(SOURCES) ; do $(CPP) $(INCLUDES) -M $$i >>$(DEPFILE) ; done
-
+
#
# include a dependency file if one exists
#
#ifeq ($(DEPFILE),$(wildcard $(DEPFILE)))
-include $(DEPFILE)
+#include $(DEPFILE)
#endif