diff options
| author | Manish Singh <yosh@src.gnome.org> | 2005-02-07 21:50:47 +0000 |
|---|---|---|
| committer | Manish Singh <yosh@src.gnome.org> | 2005-02-07 21:50:47 +0000 |
| commit | d508b2608051bc953d074d9a7ec2e1ec3514473f (patch) | |
| tree | d659a07bd1b3bff6eb0a8f5565072d34e2c0db98 | |
| parent | d52f78b10b8c1f29f04877d9e6e6635613f0653e (diff) | |
| download | pango-d508b2608051bc953d074d9a7ec2e1ec3514473f.tar.gz | |
Remove inadvertent references to "khmer" module
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | modules/Makefile.am | 1 | ||||
| -rw-r--r-- | modules/makefile.msc | 8 |
3 files changed, 3 insertions, 12 deletions
diff --git a/configure.in b/configure.in index aceb8270..de447ea1 100644 --- a/configure.in +++ b/configure.in @@ -360,12 +360,11 @@ basic_modules="basic-fc,basic-win32,basic-x" hangul_modules="hangul-fc" hebrew_modules="hebrew-fc" indic_modules="indic-fc" -khmer_modules="khmer-fc" syriac_modules="syriac-fc" thai_modules="thai-fc" tibetan_modules="tibetan-fc" -all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$khmer_modules,$syriac_modules,$thai_modules,$tibetan_modules" +all_modules="$arabic_modules,$basic_modules,$hangul_modules,$hebrew_modules,$indic_modules,$syriac_modules,$thai_modules,$tibetan_modules" included_modules="" if test "x$with_included_modules" != xno || test "x$with_included_modules" = x ; then @@ -420,8 +419,6 @@ AM_CONDITIONAL(INCLUDE_HEBREW_FC,echo $included_modules | egrep '(^|,)hebrew-fc( AM_CONDITIONAL(INCLUDE_INDIC_FC,echo $included_modules | egrep '(^|,)indic-fc($|,)' > /dev/null) -AM_CONDITIONAL(INCLUDE_KHMER_FC,echo $included_modules | grep '(^|,)khmer-fc($|,)' > /dev/null) - AM_CONDITIONAL(INCLUDE_SYRIAC_FC,echo $included_modules | egrep '(^|,)syriac-fc($|,)' > /dev/null) AM_CONDITIONAL(INCLUDE_THAI_FC,echo $included_modules | egrep '(^|,)thai-fc($|,)' > /dev/null) @@ -691,7 +688,6 @@ modules/basic/Makefile modules/hangul/Makefile modules/hebrew/Makefile modules/indic/Makefile -modules/khmer/Makefile modules/syriac/Makefile modules/thai/Makefile modules/tibetan/Makefile diff --git a/modules/Makefile.am b/modules/Makefile.am index 39cc6ff7..f1ff5d30 100644 --- a/modules/Makefile.am +++ b/modules/Makefile.am @@ -6,7 +6,6 @@ SUBDIRS = \ hangul \ hebrew \ indic \ - khmer \ syriac \ thai \ tibetan diff --git a/modules/makefile.msc b/modules/makefile.msc index 5d5786f0..1f157f55 100644 --- a/modules/makefile.msc +++ b/modules/makefile.msc @@ -1,6 +1,6 @@ # modles for the ft2 backend, don't include 'basic' # here it is built-in pangoft.dll, see ../pango/makefile.msc -MODULES = arabic hangul hebrew indic syriac thai khmer +MODULES = arabic hangul hebrew indic syriac thai !IFNDEF MODULE @@ -43,10 +43,6 @@ OBJECTS = syriac-fc.obj syriac-ot.obj OBJECTS = thai-fc.obj thai-shaper.obj !ENDIF -!IFDEF OBJ_khmer -OBJECTS = khmer_fc.obj -!ENDIF - !IFNDEF OBJECTS OBJECTS = $(MODULE)-fc.obj !ENDIF @@ -60,4 +56,4 @@ libpango-$(MODULE)-fc.dll : $(OBJECTS) ..\module.def $(CC) $(CFLAGS) -LD -Fe$@ $(OBJECTS) $(LINKS) $(LDFLAGS) /def:..\module.def # MODULE -!ENDIF
\ No newline at end of file +!ENDIF |