Update

[l4.git] / l4 / pkg / libpng / lib / contrib / scripts / makefile.darwin

diff --git a/l4/pkg/libpng/lib/contrib/scripts/makefile.darwin b/l4/pkg/libpng/lib/contrib/scripts/makefile.darwin
index fd6adff5be4db6c4e8b078ae5ed80cd3909609f3..be3f92c54b4406cab6f707231ae92c0f56eca374 100644 (file)
--- a/l4/pkg/libpng/lib/contrib/scripts/makefile.darwin
+++ b/l4/pkg/libpng/lib/contrib/scripts/makefile.darwin
@@ -36,12 +36,11 @@ LN_SF=ln -sf
 RANLIB=ranlib
 CP=cp
 RM_F=/bin/rm -f
-ARCH=-arch ppc -arch i386 -arch x86_64
 
 CPPFLAGS=-I$(ZLIBINC)
 # CFLAGS=-W -Wall -O3 -funroll-loops
-CFLAGS=-W -Wall -O -funroll-loops $(ARCH)
-LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz $(ARCH)
+CFLAGS=-W -Wall -O -funroll-loops
+LDFLAGS=-L. -L$(ZLIBLIB) -lpng16 -lz
 
 INCPATH=$(prefix)/include
 LIBPATH=$(exec_prefix)/lib
@@ -84,7 +83,7 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
 
 pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
-       $(CP) $< $@
+       $(CP) $(PNGLIBCONF_H_PREBUILT) $@
 
 libpng.a: $(OBJS)
        $(AR_RC) $@ $(OBJS)
@@ -113,7 +112,7 @@ $(LIBSOMAJ): $(OBJSDLL)
        $(CC) -dynamiclib \
         -install_name $(LIBPATH)/$(LIBSOMAJ) \
         -current_version 16 -compatibility_version 16 \
-        $(ARCH) -o $(LIBSOMAJ) \
+        -o $(LIBSOMAJ) \
         $(OBJSDLL) -L$(ZLIBLIB) -lz
 
 pngtest: pngtest.o $(LIBSO)