main: remove extern C around #includes in ff_fragment_shader.cpp

[mesa.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e411218eb2f1eb9a00046e8466bb07df4e7769e6..8819f1fef1141650cece821744d5c738b297e1d2 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,76 +21,66 @@
 
 SUBDIRS = src
 
-doxygen:
-       cd doxygen && $(MAKE)
-
-check-local:
-       $(MAKE) -C src/mapi/glapi/tests check
-       $(MAKE) -C src/mapi/shared-glapi/tests check
-       $(MAKE) -C src/mesa/main/tests check
-       $(MAKE) -C src/glsl/tests check
-       $(MAKE) -C src/glx/tests check
-
-clean-local:
-       -@touch $(top_builddir)/configs/current
-       -@for dir in $(SUBDIRS) ; do \
-               if [ -d $$dir ] ; then \
-                       (cd $$dir && $(MAKE) clean) ; \
-               fi \
-       done
-       -@test -s $(top_builddir)/configs/current || rm -f $(top_builddir)/configs/current
-
-
-
-distclean-local:
-       -rm -rf lib*
-       -rm -f $(top_builddir)/configs/current
-       -find . '(' -name '*.o' -o -name '*.a' -o -name '*.so' -o \
-         -name depend -o -name depend.bak ')' -exec rm -f '{}' ';'
-
-.PHONY: doxygen
+ACLOCAL_AMFLAGS = -I m4
 
 # Rules for making release tarballs
 
-PACKAGE_VERSION=9.1-devel
 PACKAGE_DIR = Mesa-$(PACKAGE_VERSION)
 PACKAGE_NAME = MesaLib-$(PACKAGE_VERSION)
 
+EXTRA_DIST = \
+       autogen.sh \
+       common.py \
+       docs \
+       doxygen \
+       scons \
+       SConstruct
+
 EXTRA_FILES = \
        aclocal.m4                                      \
        configure                                       \
-       src/glsl/glsl_parser.cc                         \
+       bin/ar-lib                                      \
+       bin/compile                                     \
+       bin/config.sub                                  \
+       bin/config.guess                                \
+       bin/depcomp                                     \
+       bin/install-sh                                  \
+       bin/ltmain.sh                                   \
+       bin/missing                                     \
+       bin/ylwrap                                      \
+        bin/test-driver                                        \
+       src/glsl/glsl_parser.cpp                        \
        src/glsl/glsl_parser.h                          \
-       src/glsl/glsl_lexer.cc                          \
+       src/glsl/glsl_lexer.cpp                         \
        src/glsl/glcpp/glcpp-lex.c                      \
        src/glsl/glcpp/glcpp-parse.c                    \
        src/glsl/glcpp/glcpp-parse.h                    \
-       src/mesa/main/api_exec_es1.c                    \
-       src/mesa/main/api_exec_es1_dispatch.h           \
-       src/mesa/main/api_exec_es1_remap_helper.h       \
-       src/mesa/main/api_exec_es2.c                    \
-       src/mesa/main/api_exec_es2_dispatch.h           \
-       src/mesa/main/api_exec_es2_remap_helper.h       \
        src/mesa/program/lex.yy.c                       \
        src/mesa/program/program_parse.tab.c            \
-       src/mesa/program/program_parse.tab.h
+       src/mesa/program/program_parse.tab.h            \
+       `git ls-files | grep "Makefile.am" | sed -e "s/Makefile.am/Makefile.in/"`
+
+noinst_HEADERS =                                       \
+       include/c99_compat.h                            \
+       include/c99                                     \
+       include/c11                                     \
+       include/D3D9                                    \
+       include/HaikuGL                                 \
+       include/pci_ids
 
 IGNORE_FILES = \
        -x autogen.sh
 
 
 parsers: configure
-       -@touch $(top_builddir)/configs/current
-       $(MAKE) -C src/glsl glsl_parser.cc glsl_parser.h glsl_lexer.cc
-       $(MAKE) -C src/glsl/glcpp glcpp-lex.c glcpp-parse.c glcpp-parse.h
-       $(MAKE) -C src/mesa program/lex.yy.c program/program_parse.tab.c program/program_parse.tab.h
+       $(MAKE) -C src/glsl glsl_parser.cpp glsl_parser.h glsl_lexer.cpp glcpp/glcpp-lex.c glcpp/glcpp-parse.c glcpp/glcpp-parse.h
 
 # Everything for new a Mesa release:
 ARCHIVES = $(PACKAGE_NAME).tar.gz \
        $(PACKAGE_NAME).tar.bz2 \
        $(PACKAGE_NAME).zip
 
-tarballs: md5
+tarballs: checksums
        rm -f ../$(PACKAGE_DIR) $(PACKAGE_NAME).tar
 
 manifest.txt: .git
@@ -117,9 +107,14 @@ $(PACKAGE_NAME).zip: parsers ../$(PACKAGE_DIR) manifest.txt
        zip -q -@ $(PACKAGE_NAME).zip < $(PACKAGE_DIR)/manifest.txt ; \
        mv $(PACKAGE_NAME).zip $(PACKAGE_DIR)
 
-md5: $(ARCHIVES)
-       @-md5sum $(PACKAGE_NAME).tar.gz
-       @-md5sum $(PACKAGE_NAME).tar.bz2
-       @-md5sum $(PACKAGE_NAME).zip
+checksums: $(ARCHIVES)
+       @-sha256sum $(PACKAGE_NAME).tar.gz
+       @-sha256sum $(PACKAGE_NAME).tar.bz2
+       @-sha256sum $(PACKAGE_NAME).zip
+
+.PHONY: tarballs checksums
 
-.PHONY: tarballs md5
+# We list some directories in EXTRA_DIST, but don't actually want to include
+# the .gitignore files in the tarball.
+dist-hook:
+       find $(distdir) -name .gitignore -exec $(RM) {} +